From 6aaa58c4709c43ffb9f3f2be299cd5c4044f24a3 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 2 Aug 2003 22:24:49 +1000
Subject:  - (dtucker) OpenBSD CVS Sync    - 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....
---
 auth-passwd.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'auth-passwd.c')

diff --git a/auth-passwd.c b/auth-passwd.c
index c0b7f725..780e9234 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)
-- 
cgit v1.2.1