1 files changed, 8 insertions, 2 deletions

diff --git a/readconf.c b/readconf.c
index 6519ec667..a4ae73333 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;
 }
 
 /*