diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2003-08-02 14:24:49 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2003-08-02 14:24:49 +0200 |
| commit | 6aaa58c4709c43ffb9f3f2be299cd5c4044f24a3 (patch) | |
| tree | ecaaf1b076e187ff9e338c844547dec1be09e006 /auth-passwd.c | |
| parent | - (dtucker) [monitor.h monitor_wrap.h] Remove excess ident tags. (diff) | |
| download | openssh-6aaa58c4709c43ffb9f3f2be299cd5c4044f24a3.tar.xz openssh-6aaa58c4709c43ffb9f3f2be299cd5c4044f24a3.zip | |
- (dtucker) OpenBSD CVS SyncPOST_KRB4_REMOVAL
- markus@cvs.openbsd.org 2003/07/22 13:35:22
[auth1.c auth.h auth-passwd.c monitor.c monitor.h monitor_wrap.c
monitor_wrap.h readconf.c readconf.h servconf.c servconf.h session.c ssh.1
ssh.c ssh_config.5 sshconnect1.c sshd.c sshd_config.5 ssh.h]
remove (already disabled) KRB4/AFS support, re-enable -k in ssh(1);
test+ok henning@
- (dtucker) [Makefile.in acconfig.h configure.ac] Remove KRB4/AFS support.
- (dtucker) [auth-krb4.c radix.c radix.h] Remove KRB4/AFS specific files.
I hope I got this right....
Diffstat (limited to 'auth-passwd.c')
| -rw-r--r-- | auth-passwd.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/auth-passwd.c b/auth-passwd.c index c0b7f725f..780e92344 100644 --- a/auth-passwd.c +++ b/auth-passwd.c @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-passwd.c,v 1.27 2002/05/24 16:45:16 stevesk Exp $"); +RCSID("$OpenBSD: auth-passwd.c,v 1.28 2003/07/22 13:35:22 markus Exp $"); #include "packet.h" #include "log.h" @@ -131,14 +131,6 @@ auth_password(Authctxt *authctxt, const char *password) return (authsuccess); } # endif -# ifdef KRB4 - if (options.kerberos_authentication == 1) { - int ret = auth_krb4_password(authctxt, password); - if (ret == 1 || ret == 0) - return ret; - /* Fall back to ordinary passwd authentication. */ - } -# endif # ifdef BSD_AUTH if (auth_userokay(pw->pw_name, authctxt->style, "auth-ssh", (char *)password) == 0) |