From 2d7f04d018450cbf0fa35a8999755476d8093110 Mon Sep 17 00:00:00 2001
From: Gleydson Soares <gsoares@cvs.openbsd.org>
Date: Fri, 2 Sep 2016 10:36:52 +0000
Subject: krb5 bits should rest in peace OK deraadt

---
 libexec/login_passwd/common.h | 5 +----
 libexec/login_passwd/login.c  | 6 +-----
 2 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'libexec')

diff --git a/libexec/login_passwd/common.h b/libexec/login_passwd/common.h
index b810d69dd3d..68e4bc910b6 100644
--- a/libexec/login_passwd/common.h
+++ b/libexec/login_passwd/common.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: common.h,v 1.6 2015/10/24 13:53:20 ajacoutot Exp $ */
+/* $OpenBSD: common.h,v 1.7 2016/09/02 10:36:51 gsoares Exp $ */
 /*-
  * Copyright (c) 2001 Hans Insulander <hin@openbsd.org>.
  * All rights reserved.
@@ -57,8 +57,5 @@ extern FILE *back;
 #ifdef PASSWD
 int pwd_login(char *, char *, char *, int, char *);
 #endif
-#ifdef KRB5
-int krb5_login(char *, char *, char *, int, int, char *);
-#endif
 
 #endif /* !_COMMON_H_ */
diff --git a/libexec/login_passwd/login.c b/libexec/login_passwd/login.c
index 88f8089b2b3..e0f12dd1c44 100644
--- a/libexec/login_passwd/login.c
+++ b/libexec/login_passwd/login.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login.c,v 1.13 2016/08/16 04:44:38 tedu Exp $	*/
+/*	$OpenBSD: login.c,v 1.14 2016/09/02 10:36:51 gsoares Exp $	*/
 
 /*-
  * Copyright (c) 1995 Berkeley Software Design, Inc. All rights reserved.
@@ -148,10 +148,6 @@ main(int argc, char **argv)
 	}
 
 	ret = AUTH_FAILED;
-#ifdef KRB5
-	ret = krb5_login(username, invokinguser, password, arg_login,
-			 !arg_notickets, class);
-#endif
 #ifdef PASSWD
 	if (ret != AUTH_OK)
 		ret = pwd_login(username, password, wheel, lastchance, class);
-- 
cgit v1.2.3