Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src/usr.bin/passwd Pull up following revision(s) (requested b...
details: https://anonhg.NetBSD.org/src/rev/54f021e97fef
branches: netbsd-6
changeset: 776898:54f021e97fef
user: martin <martin%NetBSD.org@localhost>
date: Wed Feb 11 14:46:36 2015 +0000
description:
Pull up following revision(s) (requested by aymeric in ticket #1251):
usr.bin/passwd/Makefile: revision 1.43,1.44
don't build kpasswd; heimdal does it for us.
Keep the built-in support for passwd -k, but don't make the kpasswd link or
install the kpasswd man page.
diffstat:
usr.bin/passwd/Makefile | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diffs (21 lines):
diff -r d200045a3234 -r 54f021e97fef usr.bin/passwd/Makefile
--- a/usr.bin/passwd/Makefile Wed Feb 11 14:41:03 2015 +0000
+++ b/usr.bin/passwd/Makefile Wed Feb 11 14:46:36 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2011/04/24 21:42:06 elric Exp $
+# $NetBSD: Makefile,v 1.42.6.1 2015/02/11 14:46:36 martin Exp $
# from: @(#)Makefile 8.3 (Berkeley) 4/2/94
.include <bsd.own.mk>
@@ -31,9 +31,11 @@
DPADD+= ${LIBKRB5} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBCRYPT}
LDADD+= -lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lcrypt
+.ifdef OVERRIDE_HEIMDAL_KPASSWD
LINKS+= ${BINDIR}/passwd ${BINDIR}/kpasswd
MAN+= kpasswd.1
.endif
+.endif
.if (${USE_PAM} != "no")
CPPFLAGS+=-DUSE_PAM
Home |
Main Index |
Thread Index |
Old Index