Found these lurking earlier.
I looked for things depending on them and didn't find any,
maybe they were just missed in the giant tedu?
Index: libexec/login_passwd/common.h
===================================================================
RCS file: /cvs/src/libexec/login_passwd/common.h,v
retrieving revision 1.4
diff -u -p -r1.4 common.h
--- libexec/login_passwd/common.h 1 Jun 2012 01:43:19 -0000 1.4
+++ libexec/login_passwd/common.h 27 Nov 2014 08:11:56 -0000
@@ -58,8 +58,5 @@ extern FILE *back;
int pwd_login(char *, char *, char *, int, char *);
int pwd_gensalt(char *, int, login_cap_t *, char);
#endif
-#ifdef KRB5
-int krb5_login(char *, char *, char *, int, int, char *);
-#endif
#endif /* !_COMMON_H_ */
Index: libexec/login_passwd/login.c
===================================================================
RCS file: /cvs/src/libexec/login_passwd/login.c,v
retrieving revision 1.10
diff -u -p -r1.10 login.c
--- libexec/login_passwd/login.c 1 Jun 2012 01:43:19 -0000 1.10
+++ libexec/login_passwd/login.c 27 Nov 2014 08:15:16 -0000
@@ -44,12 +44,8 @@ main(int argc, char **argv)
int opt, mode = 0, ret, lastchance = 0;
char *username, *password = NULL;
char response[1024];
- int arg_login = 0, arg_notickets = 0;
- char invokinguser[MAXLOGNAME];
char *wheel = NULL, *class = NULL;
- invokinguser[0] = '\0';
-
setpriority(PRIO_PROCESS, 0, 0);
openlog(NULL, LOG_ODELAY, LOG_AUTH);
@@ -76,13 +72,6 @@ main(int argc, char **argv)
wheel = optarg + 6;
else if (strncmp(optarg, "lastchance=", 11) == 0)
lastchance = (strcmp(optarg + 11, "yes") == 0);
- else if (strcmp(optarg, "login=yes") == 0)
- arg_login = 1;
- else if (strcmp(optarg, "notickets=yes") == 0)
- arg_notickets = 1;
- else if (strncmp(optarg, "invokinguser=", 13) == 0)
- snprintf(invokinguser, sizeof(invokinguser),
- "%s", &optarg[13]);
/* Silently ignore unsupported variables */
break;
default:
@@ -148,10 +137,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);
Index: usr.bin/passwd/passwd.c
===================================================================
RCS file: /cvs/src/usr.bin/passwd/passwd.c,v
retrieving revision 1.26
diff -u -p -r1.26 passwd.c
--- usr.bin/passwd/passwd.c 19 May 2014 15:05:13 -0000 1.26
+++ usr.bin/passwd/passwd.c 27 Nov 2014 08:20:48 -0000
@@ -36,14 +36,6 @@
#include <err.h>
#include <rpcsvc/ypclnt.h>
-/*
- * Note on configuration:
- * Generally one would not use both Kerberos and YP
- * to maintain passwords.
- *
- */
-
-int use_kerberos;
int use_yp;
#ifdef YP
@@ -52,7 +44,6 @@ int force_yp;
extern int local_passwd(char *, int);
extern int yp_passwd(char *);
-extern int krb5_passwd(int, char **);
extern int _yp_check(char **);
void usage(int retval);
@@ -79,7 +70,6 @@ main(int argc, char **argv)
while ((ch = getopt(argc, argv, "ly")) != -1)
switch (ch) {
case 'l': /* change local password file */
- use_kerberos = 0;
use_yp = 0;
break;
case 'y': /* change YP password */
@@ -88,7 +78,6 @@ main(int argc, char **argv)
fprintf(stderr, "passwd: YP not in use.\n");
exit(1);
}
- use_kerberos = 0;
use_yp = 1;
force_yp = 1;
break;
