- markus@cvs.openbsd.org 2003/08/28 12:54:34

     [auth-krb5.c auth.h auth1.c monitor.c monitor.h monitor_wrap.c]
     [monitor_wrap.h readconf.c servconf.c session.c ssh_config.5]
     [sshconnect1.c sshd.c sshd_config sshd_config.5]
     remove kerberos support from ssh1, since it has been replaced with GSSAPI;
     but keep kerberos passwd auth for ssh1 and 2; ok djm, hin, henning, ...

1 files changed, 2 insertions, 3 deletions

diff --git a/servconf.c b/servconf.c
index e13309388..6051918c2 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.125 2003/08/22 10:56:09 markus Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.126 2003/08/28 12:54:34 markus Exp $");
 
 #include "ssh.h"
 #include "log.h"
@@ -304,13 +304,12 @@ static struct {
         { "kerberosauthentication", sKerberosAuthentication },
         { "kerberosorlocalpasswd", sKerberosOrLocalPasswd },
         { "kerberosticketcleanup", sKerberosTicketCleanup },
-        { "kerberostgtpassing", sKerberosTgtPassing },
 #else
         { "kerberosauthentication", sUnsupported },
         { "kerberosorlocalpasswd", sUnsupported },
         { "kerberosticketcleanup", sUnsupported },
-        { "kerberostgtpassing", sUnsupported },
 #endif
+        { "kerberostgtpassing", sUnsupported },
         { "afstokenpassing", sUnsupported },
 #ifdef GSSAPI
         { "gssapiauthentication", sGssAuthentication },