diff options
| author | Mark Murray <markm@FreeBSD.org> | 1998-10-09 06:47:57 +0000 |
|---|---|---|
| committer | Mark Murray <markm@FreeBSD.org> | 1998-10-09 06:47:57 +0000 |
| commit | 3e8af2321b6bac15bdc63b9143cdf4549cd43132 (patch) | |
| tree | 69d6e0030efc43e53b33ae1da50a30792c4f4755 /usr.bin/rlogin | |
| parent | 8f176b4353792791f97e48841cfb1d272126e6eb (diff) | |
| download | src-3e8af2321b6bac15bdc63b9143cdf4549cd43132.tar.gz src-3e8af2321b6bac15bdc63b9143cdf4549cd43132.zip | |
Use KJH's auth.conf parser to turn on/off Kerberos in userland.
Notes
Notes:
svn path=/head/; revision=40103
Diffstat (limited to 'usr.bin/rlogin')
| -rw-r--r-- | usr.bin/rlogin/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/rlogin/rlogin.1 | 1 | ||||
| -rw-r--r-- | usr.bin/rlogin/rlogin.c | 9 |
3 files changed, 12 insertions, 4 deletions
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile index 7784633b4580..e5ca71f07b80 100644 --- a/usr.bin/rlogin/Makefile +++ b/usr.bin/rlogin/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $Id: Makefile,v 1.11 1998/09/05 00:31:38 jb Exp $ +# $Id: Makefile,v 1.12 1998/09/19 22:42:05 obrien Exp $ PROG= rlogin SRCS= rlogin.c @@ -10,13 +10,13 @@ INSTALLFLAGS=-fschg .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) SRCS+= krcmd.c kcmd.c rcmd_util.c encrypt.c -DPADD= ${LIBKRB} ${LIBDES} ${LIBCRYPT} +DPADD= ${LIBUTIL} ${LIBKRB} ${LIBDES} ${LIBCRYPT} CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \ -I${.CURDIR}/../../kerberosIV/include \ -I${.CURDIR}/../../crypto/kerberosIV/include \ -I${.CURDIR}/../../crypto/kerberosIV/lib/roken \ -I${.CURDIR}/../../crypto/kerberosIV/appl/bsd -LDADD= -lkrb -ldes -lcrypt +LDADD= -lutil -lkrb -ldes -lcrypt DISTRIBUTION= krb .PATH: ${.CURDIR}/../../crypto/kerberosIV/appl/bsd .endif diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1 index 9ba03875152c..869791f27c49 100644 --- a/usr.bin/rlogin/rlogin.1 +++ b/usr.bin/rlogin/rlogin.1 @@ -194,6 +194,7 @@ Determines the user's terminal type. .Bl -tag -width /etc/hosts -compact .It Pa /etc/hosts .It Pa /etc/hosts.equiv +.It Pa /etc/auth.conf .It Pa $HOME/.rhosts .It Pa $HOME/.klogin .El diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c index 969cbbac19a8..e6ee16c9c480 100644 --- a/usr.bin/rlogin/rlogin.c +++ b/usr.bin/rlogin/rlogin.c @@ -40,7 +40,7 @@ static const char copyright[] = #ifndef lint static const char sccsid[] = "@(#)rlogin.c 8.1 (Berkeley) 6/6/93"; static const char rcsid[] = - "$Id$"; + "$Id: rlogin.c,v 1.17 1998/03/26 18:03:41 markm Exp $"; #endif /* not lint */ /* @@ -60,6 +60,7 @@ static const char rcsid[] = #include <err.h> #include <errno.h> #include <fcntl.h> +#include <libutil.h> #include <netdb.h> #include <pwd.h> #include <setjmp.h> @@ -150,6 +151,9 @@ main(argc, argv) long omask; int argoff, ch, dflag, Dflag, one, uid; char *host, *p, *user, term[1024]; +#ifdef KERBEROS + char *k; +#endif argoff = dflag = Dflag = 0; one = 1; @@ -236,6 +240,9 @@ main(argc, argv) sp = NULL; #ifdef KERBEROS + k = auth_getval("auth_list"); + if (k && !strstr(k, "kerberos")) + use_kerberos = 0; if (use_kerberos) { sp = getservbyname((doencrypt ? "eklogin" : "klogin"), "tcp"); if (sp == NULL) { |