diff options
| author | pst <pst@FreeBSD.org> | 1994-10-19 00:03:45 +0000 |
|---|---|---|
| committer | pst <pst@FreeBSD.org> | 1994-10-19 00:03:45 +0000 |
| commit | 3bbaa5903cdfa6d903256d9ad37d1d8c20c79437 (patch) | |
| tree | 18581614639f8a987cdf2526bd645ecfdd38abd3 /usr.bin/login | |
| parent | 1552617ffdcabd5ebae23058e72580c06f45e182 (diff) | |
| download | FreeBSD-src-3bbaa5903cdfa6d903256d9ad37d1d8c20c79437.zip FreeBSD-src-3bbaa5903cdfa6d903256d9ad37d1d8c20c79437.tar.gz | |
Include most of the logdaemon v4.4 S/key changes
Diffstat (limited to 'usr.bin/login')
| -rw-r--r-- | usr.bin/login/Makefile | 15 | ||||
| -rw-r--r-- | usr.bin/login/login.c | 8 |
2 files changed, 14 insertions, 9 deletions
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile index bae657d..21131d9 100644 --- a/usr.bin/login/Makefile +++ b/usr.bin/login/Makefile @@ -1,16 +1,18 @@ # From: @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $Id$ +# $Id: Makefile,v 1.8 1994/09/30 13:26:15 csgr Exp $ PROG= login MAN1= login.1 MAN5= login.access.5 -SRCS= login.c login_access.c login_skey.c login_fbtab.c -DPADD= ${LIBUTIL} ${LIBSKEY} -LDADD= -lutil -lcrypt -lskey +SRCS= login.c login_access.c login_fbtab.c + CFLAGS+=-DLOGIN_ACCESS -DSKEY -DLOGALL -.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \ - || defined(MAKE_EBONES)) +DPADD= ${LIBUTIL} ${LIBCRYPT} ${LIBSKEY} ${LIBMD} +LDADD= -lutil -lcrypt -lskey -lmd + +.if exists(${DESTDIR}/usr/lib/libkrb.a) && \ + (defined(MAKE_KERBEROS) || defined(MAKE_EBONES)) CFLAGS+=-DKERBEROS SRCS+= klogin.c DPADD+= ${LIBKRB} ${LIBDES} @@ -22,4 +24,3 @@ BINMODE=4555 INSTALLFLAGS=-fschg .include <bsd.prog.mk> - diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c index f240b1b..a3b2683 100644 --- a/usr.bin/login/login.c +++ b/usr.bin/login/login.c @@ -68,6 +68,10 @@ static char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94"; #include <unistd.h> #include <utmp.h> +#ifdef SKEY +#include <skey.h> +#endif + #include "pathnames.h" void badlogin __P((char *)); @@ -125,7 +129,6 @@ main(argc, argv) char full_hostname[MAXHOSTNAMELEN]; #ifdef SKEY int permit_passwd = 0; - char *skey_getpass(), *skey_crypt(); #endif (void)signal(SIGALRM, timedout); @@ -259,7 +262,8 @@ main(argc, argv) #ifdef SKEY permit_passwd = skeyaccess(username, tty, - hostname ? full_hostname : NULL); + hostname ? full_hostname : NULL, + NULL); p = skey_getpass("Password:", pwd, permit_passwd); ep = skey_crypt(p, salt, pwd, permit_passwd); #else |
