summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-08-06 21:27:53 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-08-06 21:27:53 +0000
commitae996bf7d1967c83a0e0d71e9e89fa9a27d839f9 (patch)
treef86f60887b43e7afce310e073ac48417f588b1b9 /readconf.c
parent94baf30d14ec1fb5b483ccca983d9faf3ef0ae2e (diff)
- jakob@cvs.openbsd.org 2001/07/31 09:28:44
[readconf.c readconf.h ssh.1 ssh.c] add 'SmartcardDevice' client option to specify which smartcard device is used to access a smartcard used for storing the user's private RSA key. ok markus@.
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c
index 6519ec66..a4ae7333 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.84 2001/07/25 14:35:18 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.85 2001/07/31 09:28:44 jakob Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -114,7 +114,7 @@ typedef enum {
oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication,
oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,
- oHostKeyAlgorithms, oBindAddress
+ oHostKeyAlgorithms, oBindAddress, oSmartcardDevice
} OpCodes;
/* Textual representations of the tokens. */
@@ -183,6 +183,7 @@ static struct {
{ "preferredauthentications", oPreferredAuthentications },
{ "hostkeyalgorithms", oHostKeyAlgorithms },
{ "bindaddress", oBindAddress },
+ { "smartcarddevice", oSmartcardDevice },
{ NULL, 0 }
};
@@ -468,6 +469,10 @@ parse_string:
charptr = &options->bind_address;
goto parse_string;
+ case oSmartcardDevice:
+ intptr = &options->smartcard_device;
+ goto parse_int;
+
case oProxyCommand:
charptr = &options->proxy_command;
while ((arg = strdelim(&s)) != NULL && *arg != '\0') {
@@ -772,6 +777,7 @@ initialize_options(Options * options)
options->log_level = (LogLevel) - 1;
options->preferred_authentications = NULL;
options->bind_address = NULL;
+ options->smartcard_device = -1;
}
/*