- (djm) Big OpenBSD sync:

[openssh.git] / readconf.c

diff --git a/readconf.c b/readconf.c
index 4f4a16de8f18775bd8340d837c269feb9289a6c3..c6fdd5308445aa1f595d090e4eac008bf2610f07 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -12,10 +12,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.47 2000/09/07 21:13:37 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.49 2000/10/11 20:27:23 markus Exp $");
 
 #include "ssh.h"
-#include "cipher.h"
 #include "readconf.h"
 #include "match.h"
 #include "xmalloc.h"
@@ -103,7 +102,8 @@ typedef enum {
        oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,
        oCompressionLevel, oKeepAlives, oNumberOfPasswordPrompts, oTISAuthentication,
        oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oIdentityFile2,
-       oGlobalKnownHostsFile2, oUserKnownHostsFile2, oDSAAuthentication
+       oGlobalKnownHostsFile2, oUserKnownHostsFile2, oDSAAuthentication,
+       oKbdInteractiveAuthentication, oKbdInteractiveDevices
 } OpCodes;
 
 /* Textual representations of the tokens. */
@@ -119,6 +119,8 @@ static struct {
        { "useprivilegedport", oUsePrivilegedPort },
        { "rhostsauthentication", oRhostsAuthentication },
        { "passwordauthentication", oPasswordAuthentication },
+       { "kbdinteractiveauthentication", oKbdInteractiveAuthentication },
+       { "kbdinteractivedevices", oKbdInteractiveDevices },
        { "rsaauthentication", oRSAAuthentication },
        { "dsaauthentication", oDSAAuthentication },
        { "skeyauthentication", oSkeyAuthentication },
@@ -290,6 +292,14 @@ parse_flag:
                intptr = &options->password_authentication;
                goto parse_flag;
 
+       case oKbdInteractiveAuthentication:
+               intptr = &options->kbd_interactive_authentication;
+               goto parse_flag;
+
+       case oKbdInteractiveDevices:
+               charptr = &options->kbd_interactive_devices;
+               goto parse_string;
+
        case oDSAAuthentication:
                intptr = &options->dsa_authentication;
                goto parse_flag;
@@ -664,6 +674,8 @@ initialize_options(Options * options)
        options->afs_token_passing = -1;
 #endif
        options->password_authentication = -1;
+       options->kbd_interactive_authentication = -1;
+       options->kbd_interactive_devices = NULL;
        options->rhosts_rsa_authentication = -1;
        options->fallback_to_rsh = -1;
        options->use_rsh = -1;
@@ -734,6 +746,8 @@ fill_default_options(Options * options)
 #endif /* AFS */
        if (options->password_authentication == -1)
                options->password_authentication = 1;
+       if (options->kbd_interactive_authentication == -1)
+               options->kbd_interactive_authentication = 0;
        if (options->rhosts_rsa_authentication == -1)
                options->rhosts_rsa_authentication = 1;
        if (options->fallback_to_rsh == -1)