commit d248b5bd1bc1999a4d5d5ba7b433fc50e267baf6
author Damien Miller <djm@mindrot.org> Thu May 15 14:15:23 2003 +1000
committer Damien Miller <djm@mindrot.org> Thu May 15 14:15:23 2003 +1000
tree 12f967ff4d257932e1708115cb2189119e247337
parent ffda4cb2181683af35a4aee85c00d83ed9b7f11c

   - jakob@cvs.openbsd.org 2003/05/15 04:08:44
     [readconf.c servconf.c]
     disable kerberos when not supported. ok markus@

readconf.c

diff --git a/readconf.c b/readconf.c
index 4c5d448..3f2ac4e 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.108 2003/05/15 01:48:10 jakob Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.109 2003/05/15 04:08:44 jakob Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -844,11 +844,23 @@
 	if (options->challenge_response_authentication == -1)
 		options->challenge_response_authentication = 1;
 	if (options->kerberos_authentication == -1)
+#if defined(KRB4) || defined(KRB5)
 		options->kerberos_authentication = 1;
+#else
+		options->kerberos_authentication = 0;
+#endif
 	if (options->kerberos_tgt_passing == -1)
+#if defined(KRB4) || defined(KRB5)
 		options->kerberos_tgt_passing = 1;
+#else
+		options->kerberos_tgt_passing = 0;
+#endif
 	if (options->afs_token_passing == -1)
+#if defined(AFS)
 		options->afs_token_passing = 1;
+#else
+		options->afs_token_passing = 0;
+#endif
 	if (options->password_authentication == -1)
 		options->password_authentication = 1;
 	if (options->kbd_interactive_authentication == -1)