- jakob@cvs.openbsd.org 2003/05/15 01:48:10

     [readconf.c readconf.h servconf.c servconf.h]
     always parse kerberos options. ok djm@ markus@
 - (djm) Always parse UsePAM

1 files changed, 6 insertions, 39 deletions

diff --git a/servconf.c b/servconf.c
index fbdc4d8fa..5076c5df6 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.118 2003/04/09 08:23:52 hin Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.119 2003/05/15 01:48:10 jakob Exp $");
 
 #if defined(KRB4)
 #include <krb.h>
@@ -59,10 +59,8 @@ initialize_server_options(ServerOptions *options)
 {
         memset(options, 0, sizeof(*options));
 
-#ifdef USE_PAM
         /* Portable-specific options */
         options->use_pam = -1;
-#endif
 
         /* Standard Options */
         options->num_ports = 0;
@@ -92,17 +90,11 @@ initialize_server_options(ServerOptions *options)
         options->hostbased_uses_name_from_packet_only = -1;
         options->rsa_authentication = -1;
         options->pubkey_authentication = -1;
-#if defined(KRB4) || defined(KRB5)
         options->kerberos_authentication = -1;
         options->kerberos_or_local_passwd = -1;
         options->kerberos_ticket_cleanup = -1;
-#endif
-#if defined(AFS) || defined(KRB5)
         options->kerberos_tgt_passing = -1;
-#endif
-#ifdef AFS
         options->afs_token_passing = -1;
-#endif
         options->password_authentication = -1;
         options->kbd_interactive_authentication = -1;
         options->challenge_response_authentication = -1;
@@ -138,10 +130,8 @@ void
 fill_default_server_options(ServerOptions *options)
 {
         /* Portable-specific options */
-#ifdef USE_PAM
         if (options->use_pam == -1)
-                options->use_pam = 1;
-#endif
+                options->use_pam = 0;
 
         /* Standard Options */
         if (options->protocol == SSH_PROTO_UNKNOWN)
@@ -208,22 +198,16 @@ fill_default_server_options(ServerOptions *options)
                 options->rsa_authentication = 1;
         if (options->pubkey_authentication == -1)
                 options->pubkey_authentication = 1;
-#if defined(KRB4) || defined(KRB5)
         if (options->kerberos_authentication == -1)
                 options->kerberos_authentication = 0;
         if (options->kerberos_or_local_passwd == -1)
                 options->kerberos_or_local_passwd = 1;
         if (options->kerberos_ticket_cleanup == -1)
                 options->kerberos_ticket_cleanup = 1;
-#endif
-#if defined(AFS) || defined(KRB5)
         if (options->kerberos_tgt_passing == -1)
                 options->kerberos_tgt_passing = 0;
-#endif
-#ifdef AFS
         if (options->afs_token_passing == -1)
                 options->afs_token_passing = 0;
-#endif
         if (options->password_authentication == -1)
                 options->password_authentication = 1;
         if (options->kbd_interactive_authentication == -1)
@@ -288,16 +272,8 @@ typedef enum {
         sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime,
         sPermitRootLogin, sLogFacility, sLogLevel,
         sRhostsAuthentication, sRhostsRSAAuthentication, sRSAAuthentication,
-#if defined(KRB4) || defined(KRB5)
         sKerberosAuthentication, sKerberosOrLocalPasswd, sKerberosTicketCleanup,
-#endif
-#if defined(AFS) || defined(KRB5)
-        sKerberosTgtPassing,
-#endif
-#ifdef AFS
-        sAFSTokenPassing,
-#endif
-        sChallengeResponseAuthentication,
+        sKerberosTgtPassing, sAFSTokenPassing, sChallengeResponseAuthentication,
         sPasswordAuthentication, sKbdInteractiveAuthentication, sListenAddress,
         sPrintMotd, sPrintLastLog, sIgnoreRhosts,
         sX11Forwarding, sX11DisplayOffset, sX11UseLocalhost,
@@ -338,17 +314,11 @@ static struct {
         { "rsaauthentication", sRSAAuthentication },
         { "pubkeyauthentication", sPubkeyAuthentication },
         { "dsaauthentication", sPubkeyAuthentication },                 /* alias */
-#if defined(KRB4) || defined(KRB5)
         { "kerberosauthentication", sKerberosAuthentication },
         { "kerberosorlocalpasswd", sKerberosOrLocalPasswd },
         { "kerberosticketcleanup", sKerberosTicketCleanup },
-#endif
-#if defined(AFS) || defined(KRB5)
         { "kerberostgtpassing", sKerberosTgtPassing },
-#endif
-#ifdef AFS
         { "afstokenpassing", sAFSTokenPassing },
-#endif
         { "passwordauthentication", sPasswordAuthentication },
         { "kbdinteractiveauthentication", sKbdInteractiveAuthentication },
         { "challengeresponseauthentication", sChallengeResponseAuthentication },
@@ -653,7 +623,7 @@ parse_flag:
         case sPubkeyAuthentication:
                 intptr = &options->pubkey_authentication;
                 goto parse_flag;
-#if defined(KRB4) || defined(KRB5)
+
         case sKerberosAuthentication:
                 intptr = &options->kerberos_authentication;
                 goto parse_flag;
@@ -665,17 +635,14 @@ parse_flag:
         case sKerberosTicketCleanup:
                 intptr = &options->kerberos_ticket_cleanup;
                 goto parse_flag;
-#endif
-#if defined(AFS) || defined(KRB5)
+
         case sKerberosTgtPassing:
                 intptr = &options->kerberos_tgt_passing;
                 goto parse_flag;
-#endif
-#ifdef AFS
+
         case sAFSTokenPassing:
                 intptr = &options->afs_token_passing;
                 goto parse_flag;
-#endif
 
         case sPasswordAuthentication:
                 intptr = &options->password_authentication;