nuke "kerberos-2@ssh.com"

3 files changed, 3 insertions, 77 deletions

diff --git a/usr.bin/ssh/auth2-krb5.c b/usr.bin/ssh/auth2-krb5.c
deleted file mode 100644
index dab1a0766f0..00000000000
--- a/usr.bin/ssh/auth2-krb5.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2003 Markus Friedl.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "includes.h"
-RCSID("$OpenBSD: auth2-krb5.c,v 1.2 2003/05/15 14:09:21 markus Exp $");
-
-#include <krb5.h>
-
-#include "ssh2.h"
-#include "xmalloc.h"
-#include "packet.h"
-#include "log.h"
-#include "auth.h"
-#include "monitor_wrap.h"
-#include "servconf.h"
-
-/* import */
-extern ServerOptions options;
-
-static int
-userauth_kerberos(Authctxt *authctxt)
-{
-	krb5_data tkt, reply;
-	u_int dlen;
-	char *client = NULL;
-	int authenticated = 0;
-
-	tkt.data = packet_get_string(&dlen);
-	tkt.length = dlen;
-	packet_check_eom();
-
-	if (PRIVSEP(auth_krb5(authctxt, &tkt, &client, &reply))) {
-		authenticated = 1;
-		if (reply.length)
-			xfree(reply.data);
-	}
-	if (client)
-		xfree(client);
-	xfree(tkt.data);
-	return (authenticated);
-}
-
-Authmethod method_kerberos = {
-	"kerberos-2@ssh.com",
-	userauth_kerberos,
-	&options.kerberos_authentication
-};
diff --git a/usr.bin/ssh/auth2.c b/usr.bin/ssh/auth2.c
index 051e7418281..192f4aaddb1 100644
--- a/usr.bin/ssh/auth2.c
+++ b/usr.bin/ssh/auth2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.100 2003/08/22 10:56:08 markus Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.101 2003/08/22 13:22:27 markus Exp $");
 
 #include "ssh2.h"
 #include "xmalloc.h"
@@ -54,9 +54,6 @@ extern Authmethod method_pubkey;
 extern Authmethod method_passwd;
 extern Authmethod method_kbdint;
 extern Authmethod method_hostbased;
-#ifdef KRB5
-extern Authmethod method_kerberos;
-#endif
 #ifdef GSSAPI
 extern Authmethod method_gssapi;
 #endif
@@ -70,9 +67,6 @@ Authmethod *authmethods[] = {
 	&method_passwd,
 	&method_kbdint,
 	&method_hostbased,
-#ifdef KRB5
-	&method_kerberos,
-#endif
 	NULL
 };
 
diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile
index 8775f8ee022..10fa98d15cc 100644
--- a/usr.bin/ssh/sshd/Makefile
+++ b/usr.bin/ssh/sshd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.59 2003/08/22 10:56:09 markus Exp $
+#	$OpenBSD: Makefile,v 1.60 2003/08/22 13:22:27 markus Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -22,7 +22,7 @@ SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 
 .if (${KERBEROS5:L} == "yes")
 CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV
-SRCS+=  auth-krb5.c auth2-krb5.c
+SRCS+=  auth-krb5.c
 
 LDADD+= -lkrb5 
 DPADD+= ${LIBKRB5}