- jakob@cvs.openbsd.org 2003/05/15 04:08:44

     [readconf.c servconf.c]
     disable kerberos when not supported. ok markus@

diff --git a/ChangeLog b/ChangeLog
index f2acac8c79eaf6dd59f33f46e19747217cb4f77c..7f4c5edba62237a8e3638c7a9e79b3d921c83731 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -121,6 +121,9 @@
      http://bugzilla.mindrot.org/show_bug.cgi?id=560
      Privsep child continues to run after monitor killed.
      Pass monitor signals through to child; Darren Tucker
+   - jakob@cvs.openbsd.org 2003/05/15 04:08:44
+     [readconf.c servconf.c]
+     disable kerberos when not supported. ok markus@
  - (djm) Make portable build with MIT krb5 (some issues remain)
  - (djm) Add new UsePAM configuration directive to allow runtime control
    over usage of PAM. This allows non-root use of sshd when built with

diff --git a/readconf.c b/readconf.c
index 4c5d4485937a0ce2c88fc7b0f43599e0ade150a4..3f2ac4e3e0752700065f13e857ca5359bba53545 100644 (file)
--- 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 @@ fill_default_options(Options * options)
        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)

diff --git a/servconf.c b/servconf.c
index 5076c5df6d4cc79384eda1bdcbb76e2ede3c3091..92d3170b23b7a318dd1adc96e4d85415645f0744 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.119 2003/05/15 01:48:10 jakob Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.120 2003/05/15 04:08:44 jakob Exp $");
 
 #if defined(KRB4)
 #include <krb.h>
@@ -203,7 +203,11 @@ 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)