- jakob@cvs.openbsd.org 2003/05/15 14:02:47

     [readconf.c servconf.c]
     warn for unsupported config option. ok markus@

1 files changed, 20 insertions, 6 deletions

diff --git a/servconf.c b/servconf.c
index 5840961e3..f37193a8f 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.120 2003/05/15 04:08:44 jakob Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.121 2003/05/15 14:02:47 jakob Exp $");
 
 #if defined(KRB4)
 #include <krb.h>
@@ -207,11 +207,7 @@ fill_default_server_options(ServerOptions *options)
         if (options->kerberos_or_local_passwd == -1)
                 options->kerberos_or_local_passwd = 1;
         if (options->kerberos_ticket_cleanup == -1)
-#if defined(KRB4) || defined(KRB5)
                 options->kerberos_ticket_cleanup = 1;
-#else
-                options->kerberos_ticket_cleanup = 0;
-#endif
         if (options->kerberos_tgt_passing == -1)
                 options->kerberos_tgt_passing = 0;
         if (options->afs_token_passing == -1)
@@ -294,7 +290,7 @@ typedef enum {
         sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
         sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
         sUsePrivilegeSeparation,
-        sDeprecated
+        sDeprecated, sUnsupported
 } ServerOpCodes;
 
 /* Textual representation of the tokens. */
@@ -322,11 +318,22 @@ static struct {
         { "rsaauthentication", sRSAAuthentication },
         { "pubkeyauthentication", sPubkeyAuthentication },
         { "dsaauthentication", sPubkeyAuthentication },                 /* alias */
+#if defined(KRB4) || defined(KRB5)
         { "kerberosauthentication", sKerberosAuthentication },
         { "kerberosorlocalpasswd", sKerberosOrLocalPasswd },
         { "kerberosticketcleanup", sKerberosTicketCleanup },
         { "kerberostgtpassing", sKerberosTgtPassing },
+#else
+        { "kerberosauthentication", sUnsupported },
+        { "kerberosorlocalpasswd", sUnsupported },
+        { "kerberosticketcleanup", sUnsupported },
+        { "kerberostgtpassing", sUnsupported },
+#endif
+#if defined(AFS)
         { "afstokenpassing", sAFSTokenPassing },
+#else
+        { "afstokenpassing", sUnsupported },
+#endif
         { "passwordauthentication", sPasswordAuthentication },
         { "kbdinteractiveauthentication", sKbdInteractiveAuthentication },
         { "challengeresponseauthentication", sChallengeResponseAuthentication },
@@ -899,6 +906,13 @@ parse_flag:
                     arg = strdelim(&cp);
                 break;
 
+        case sUnsupported:
+                logit("%s line %d: Unsupported option %s",
+                    filename, linenum, arg);
+                while (arg)
+                    arg = strdelim(&cp);
+                break;
+
         default:
                 fatal("%s line %d: Missing handler for opcode %s (%d)",
                     filename, linenum, arg, opcode);