diff options
| author | markm <markm@FreeBSD.org> | 1997-09-28 08:57:24 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 1997-09-28 08:57:24 +0000 |
| commit | 991f2e7747012b7a3ac9aaefb97e4ccbb4125789 (patch) | |
| tree | 544fbda0330e990e150c4b3c6b3277caf457742f /usr.bin/passwd | |
| parent | 9a65690bbfef5ffb763f038713e5be5aee18fe55 (diff) | |
| download | FreeBSD-src-991f2e7747012b7a3ac9aaefb97e4ccbb4125789.zip FreeBSD-src-991f2e7747012b7a3ac9aaefb97e4ccbb4125789.tar.gz | |
Changes for KTH KerberosIV.
Also quieten -Wall a bit.
Diffstat (limited to 'usr.bin/passwd')
| -rw-r--r-- | usr.bin/passwd/Makefile | 13 | ||||
| -rw-r--r-- | usr.bin/passwd/yp_passwd.c | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index b2346b2..c4c1586 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -1,9 +1,10 @@ # From: @(#)Makefile 8.3 (Berkeley) 4/2/94 -# $Id: Makefile,v 1.2 1997/07/28 18:31:45 wpaul Exp $ +# $Id: Makefile,v 1.25 1997/07/29 15:45:04 wpaul Exp $ PROG= passwd SRCS= local_passwd.c yppasswd_private_xdr.c yp_passwd.c \ passwd.c pw_copy.c pw_util.c pw_yp.c +CFLAGS+=-Wall DPADD= ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL} LDADD= -lcrypt -lrpcsvc -lutil @@ -55,15 +56,13 @@ MAN1=passwd.1 LINKS=${BINDIR}/passwd ${BINDIR}/yppasswd MLINKS=passwd.1 yppasswd.1 -.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES)) -SRCS+= kpasswd.c +.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS4)) +SRCS+= kpasswd_standalone.c .PATH: ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \ ${.CURDIR}/../../usr.bin/rlogin ${.CURDIR}/../../usr.bin/passwd \ - ${.CURDIR}/../../eBones/usr.bin/passwd + ${.CURDIR}/../../crypto/kerberosIV/kadmin -CFLAGS+= -DKERBEROS \ - -I${.CURDIR}/../../eBones/include \ - -I${.CURDIR}/../../eBones/lib/libkadm +CFLAGS+= -DKERBEROS # XXX not defined: ${LIBKADM}, ${LIBCOM_ERR} DPADD= ${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBRPCSVC} ${LIBCOM_ERR} ${LIBUTIL} LDADD= -lkadm -lkrb -ldes -lcrypt -lrpcsvc -lcom_err -lutil diff --git a/usr.bin/passwd/yp_passwd.c b/usr.bin/passwd/yp_passwd.c index c36f2da..92688ed 100644 --- a/usr.bin/passwd/yp_passwd.c +++ b/usr.bin/passwd/yp_passwd.c @@ -45,6 +45,7 @@ #include <rpcsvc/ypclnt.h> #include <rpcsvc/yppasswd.h> #include <pw_yp.h> +#include <err.h> #include "yppasswd_private.h" extern char *getnewpasswd __P(( struct passwd * , int )); @@ -52,7 +53,6 @@ extern char *getnewpasswd __P(( struct passwd * , int )); int yp_passwd(char *user) { - struct timeval timeout; struct yppasswd yppasswd; struct master_yppasswd master_yppasswd; struct passwd *pw; |
