diff options
| author | markm <markm@FreeBSD.org> | 1998-10-09 06:38:33 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 1998-10-09 06:38:33 +0000 |
| commit | a486b8dd50ee11dd8e42be9103b74c714abcf631 (patch) | |
| tree | ddb31532cd0f84acc32799330d1ec1e1841c0e51 /usr.bin/login | |
| parent | 79f5d6d3ccabbef03bb521b83cf0c5633862e5e6 (diff) | |
| download | FreeBSD-src-a486b8dd50ee11dd8e42be9103b74c714abcf631.zip FreeBSD-src-a486b8dd50ee11dd8e42be9103b74c714abcf631.tar.gz | |
Use KJH's auth.conf parser to turn on/off Kerberos in userland.
Diffstat (limited to 'usr.bin/login')
| -rw-r--r-- | usr.bin/login/login.1 | 4 | ||||
| -rw-r--r-- | usr.bin/login/login.c | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1 index 26857f1..b373bb1 100644 --- a/usr.bin/login/login.1 +++ b/usr.bin/login/login.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)login.1 8.2 (Berkeley) 5/5/94 -.\" $Id: login.1,v 1.9 1997/07/22 07:39:42 charnier Exp $ +.\" $Id: login.1,v 1.10 1998/01/07 10:42:57 obrien Exp $ .\" .Dd May 5, 1994 .Dt LOGIN 1 @@ -176,6 +176,8 @@ login account records system mailboxes .It Pa \&.hushlogin makes login quieter +.It Pa /etc/auth.conf +configure authentication services .El .Sh SEE ALSO .Xr chpass 1 , diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c index 98b7851..fc36cb0 100644 --- a/usr.bin/login/login.c +++ b/usr.bin/login/login.c @@ -42,7 +42,7 @@ static char copyright[] = static char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94"; #endif static const char rcsid[] = - "$Id: login.c,v 1.37 1998/07/31 07:22:31 bde Exp $"; + "$Id: login.c,v 1.38 1998/08/17 03:25:07 jkoshy Exp $"; #endif /* not lint */ /* @@ -63,6 +63,7 @@ static const char rcsid[] = #include <err.h> #include <errno.h> #include <grp.h> +#include <libutil.h> #include <netdb.h> #include <pwd.h> #include <setjmp.h> @@ -175,6 +176,9 @@ main(argc, argv) #ifdef SKEY int permit_passwd = 0; #endif /* SKEY */ +#ifdef KERBEROS + char *k; +#endif (void)signal(SIGALRM, timedout); (void)alarm(timeout); @@ -472,7 +476,10 @@ main(argc, argv) rval = 1; /* failed */ } else #endif /* SKEY */ - rval = klogin(pwd, instance, localhost, p); + rval = 1; + k = auth_getval("auth_list"); + if (k && strstr(k, "kerberos")) + rval = klogin(pwd, instance, localhost, p); if (rval != 0 && rootlogin && pwd->pw_uid != 0) rootlogin = 0; if (rval == 0) |
