Module Name: src Committed By: christos Date: Mon Feb 11 23:11:49 UTC 2013
Modified Files: src/usr.bin/passwd: Makefile Log Message: don't build kpasswd; heimdal does it for us. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/usr.bin/passwd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/passwd/Makefile diff -u src/usr.bin/passwd/Makefile:1.42 src/usr.bin/passwd/Makefile:1.43 --- src/usr.bin/passwd/Makefile:1.42 Sun Apr 24 17:42:06 2011 +++ src/usr.bin/passwd/Makefile Mon Feb 11 18:11:48 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2011/04/24 21:42:06 elric Exp $ +# $NetBSD: Makefile,v 1.43 2013/02/11 23:11:48 christos Exp $ # from: @(#)Makefile 8.3 (Berkeley) 4/2/94 .include <bsd.own.mk> @@ -25,6 +25,7 @@ LDADD+= -lcrypt -lutil BINOWN= root BINMODE=4555 +.ifdef OVERRIDE_HEIMDAL_KPASSWD .if (${USE_KERBEROS} != "no") CPPFLAGS+= -DKERBEROS5 SRCS+= krb5_passwd.c @@ -34,6 +35,7 @@ LDADD+= -lkrb5 -lcrypto -lasn1 -lcom_err LINKS+= ${BINDIR}/passwd ${BINDIR}/kpasswd MAN+= kpasswd.1 .endif +.endif .if (${USE_PAM} != "no") CPPFLAGS+=-DUSE_PAM