diff options
Diffstat (limited to 'usr.bin/ssh/servconf.c')
| -rw-r--r-- | usr.bin/ssh/servconf.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index f68ecb10ab3..ab8cac6d2ea 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/servconf.c @@ -12,7 +12,7 @@ Created: Mon Aug 21 15:48:58 1995 ylo */ #include "includes.h" -RCSID("$Id: servconf.c,v 1.9 1999/10/02 19:18:22 deraadt Exp $"); +RCSID("$Id: servconf.c,v 1.10 1999/10/07 21:45:02 markus Exp $"); #include "ssh.h" #include "servconf.h" @@ -52,6 +52,9 @@ void initialize_server_options(ServerOptions *options) options->afs_token_passing = -1; #endif options->password_authentication = -1; +#ifdef SKEY + options->skey_authentication = -1; +#endif options->permit_empty_passwd = -1; options->num_allow_hosts = 0; options->num_deny_hosts = 0; @@ -120,8 +123,12 @@ void fill_default_server_options(ServerOptions *options) #endif /* AFS */ if (options->password_authentication == -1) options->password_authentication = 1; +#ifdef SKEY + if (options->skey_authentication == -1) + options->skey_authentication = 1; +#endif if (options->permit_empty_passwd == -1) - options->permit_empty_passwd = 1; + options->permit_empty_passwd = 1; } #define WHITESPACE " \t\r\n" @@ -138,6 +145,9 @@ typedef enum #ifdef AFS sKerberosTgtPassing, sAFSTokenPassing, #endif +#ifdef SKEY + sSkeyAuthentication, +#endif sPasswordAuthentication, sAllowHosts, sDenyHosts, sListenAddress, sPrintMotd, sIgnoreRhosts, sX11Forwarding, sX11DisplayOffset, sStrictModes, sEmptyPasswd, sRandomSeedFile, sKeepAlives @@ -172,6 +182,9 @@ static struct { "afstokenpassing", sAFSTokenPassing }, #endif { "passwordauthentication", sPasswordAuthentication }, +#ifdef SKEY + { "skeyauthentication", sSkeyAuthentication }, +#endif { "allowhosts", sAllowHosts }, { "denyhosts", sDenyHosts }, { "listenaddress", sListenAddress }, @@ -392,6 +405,12 @@ void read_server_config(ServerOptions *options, const char *filename) intptr = &options->password_authentication; goto parse_flag; +#ifdef SKEY + case sSkeyAuthentication: + intptr = &options->skey_authentication; + goto parse_flag; +#endif + case sPrintMotd: intptr = &options->print_motd; goto parse_flag; |