Keep the built-in support for passwd -k, but don't make the kpasswd link or

install the kpasswd man page since these are provided by heimdal. I ifdef'ed
them so that the code to install them is still with the Makefile.
This commit is contained in:
christos 2013-02-13 23:19:14 +00:00
parent bae81fec7a
commit 4d0631d87c

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.43 2013/02/11 23:11:48 christos Exp $ # $NetBSD: Makefile,v 1.44 2013/02/13 23:19:14 christos Exp $
# from: @(#)Makefile 8.3 (Berkeley) 4/2/94 # from: @(#)Makefile 8.3 (Berkeley) 4/2/94
.include <bsd.own.mk> .include <bsd.own.mk>
@ -25,13 +25,13 @@ LDADD+= -lcrypt -lutil
BINOWN= root BINOWN= root
BINMODE=4555 BINMODE=4555
.ifdef OVERRIDE_HEIMDAL_KPASSWD
.if (${USE_KERBEROS} != "no") .if (${USE_KERBEROS} != "no")
CPPFLAGS+= -DKERBEROS5 CPPFLAGS+= -DKERBEROS5
SRCS+= krb5_passwd.c SRCS+= krb5_passwd.c
DPADD+= ${LIBKRB5} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBCRYPT} DPADD+= ${LIBKRB5} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBCRYPT}
LDADD+= -lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lcrypt LDADD+= -lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lcrypt
.ifdef OVERRIDE_HEIMDAL_KPASSWD
LINKS+= ${BINDIR}/passwd ${BINDIR}/kpasswd LINKS+= ${BINDIR}/passwd ${BINDIR}/kpasswd
MAN+= kpasswd.1 MAN+= kpasswd.1
.endif .endif