- (djm) Big OpenBSD sync:

[openssh.git] / servconf.c

diff --git a/servconf.c b/servconf.c
index 81551081432a21f438541ffcdca8a703bba03a25..e90defe61e598d291cf08879b78f8e59400261fc 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.51 2000/09/07 20:27:53 deraadt Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.52 2000/10/11 20:14:39 markus Exp $");
 
 #include "ssh.h"
 #include "servconf.h"
@@ -61,6 +61,7 @@ initialize_server_options(ServerOptions *options)
        options->afs_token_passing = -1;
 #endif
        options->password_authentication = -1;
+       options->kbd_interactive_authentication = -1;
 #ifdef SKEY
        options->skey_authentication = -1;
 #endif
@@ -148,6 +149,8 @@ fill_default_server_options(ServerOptions *options)
 #endif /* AFS */
        if (options->password_authentication == -1)
                options->password_authentication = 1;
+       if (options->kbd_interactive_authentication == -1)
+               options->kbd_interactive_authentication = 0;
 #ifdef SKEY
        if (options->skey_authentication == -1)
                options->skey_authentication = 1;
@@ -183,7 +186,7 @@ typedef enum {
 #ifdef SKEY
        sSkeyAuthentication,
 #endif
-       sPasswordAuthentication, sListenAddress,
+       sPasswordAuthentication, sKbdInteractiveAuthentication, sListenAddress,
        sPrintMotd, sIgnoreRhosts, sX11Forwarding, sX11DisplayOffset,
        sStrictModes, sEmptyPasswd, sRandomSeedFile, sKeepAlives, sCheckMail,
        sUseLogin, sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,
@@ -220,6 +223,7 @@ static struct {
        { "afstokenpassing", sAFSTokenPassing },
 #endif
        { "passwordauthentication", sPasswordAuthentication },
+       { "kbdinteractiveauthentication", sKbdInteractiveAuthentication },
 #ifdef SKEY
        { "skeyauthentication", sSkeyAuthentication },
 #endif
@@ -497,6 +501,10 @@ parse_flag:
                        intptr = &options->password_authentication;
                        goto parse_flag;
 
+               case sKbdInteractiveAuthentication:
+                       intptr = &options->kbd_interactive_authentication;
+                       goto parse_flag;
+
                case sCheckMail:
                        intptr = &options->check_mail;
                        goto parse_flag;