diff options
| author | Damien Miller <djm@mindrot.org> | 2003-09-02 14:51:17 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2003-09-02 14:51:17 +0200 |
| commit | 1a0c0b96219b037865d624079a81ab7d88bbccc1 (patch) | |
| tree | ad24303a17d1f49c98b66d5bfe014103019411af /servconf.c | |
| parent | - (djm) OpenBSD CVS Sync (diff) | |
| download | openssh-1a0c0b96219b037865d624079a81ab7d88bbccc1.tar.xz openssh-1a0c0b96219b037865d624079a81ab7d88bbccc1.zip | |
- 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, ...
Diffstat (limited to 'servconf.c')
| -rw-r--r-- | servconf.c | 5 |
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 }, |