Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be consistent about making USE_PAM!=no be exclusive to USE_SKEY!=no.

Browse Source
This commit is contained in:
lukem 2008-04-06 09:54:37 +00:00
parent c32766fd4f
commit 050e20c6d5
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/lock/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.13 2008/03/30 15:30:15 lukem Exp $
# $NetBSD: Makefile,v 1.14 2008/04/06 09:54:37 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@ -14,12 +14,12 @@ BINMODE=4555
CPPFLAGS+=-DUSE_PAM
DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
LDADD+= -lpam ${PAM_STATIC_LDADD}
.endif
.else # USE_PAM == no
.if (${USE_SKEY} != "no")
CPPFLAGS+=-DSKEY
DPADD+= ${LIBSKEY}
LDADD+= -lskey
.endif
.endif # USE_PAM == no
.include <bsd.prog.mk>

6
usr.bin/login/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.47 2007/05/28 12:06:28 tls Exp $
# $NetBSD: Makefile,v 1.48 2008/04/06 09:54:37 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 7/19/93
.include <bsd.own.mk>
@ -16,7 +16,7 @@ BINMODE=4555
SRCS+= login_pam.c
LDADD+= -lpam ${PAM_STATIC_LDADD}
DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
.else
.else # USE_PAM == no
SRCS+= login.c
CPPFLAGS+=-DLOGIN_CAP -DSUPPORT_UTMP -DSUPPORT_UTMPX
@ -35,7 +35,7 @@ CPPFLAGS+=-DSKEY
DPADD+= ${LIBSKEY}
LDADD+= -lskey
.endif
.endif
.endif # USE_PAM == no
CLEANFILES+= copyrightstr.c

12
usr.bin/ssh/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.15 2007/05/28 12:06:31 tls Exp $
# $NetBSD: Makefile.inc,v 1.16 2008/04/06 09:54:37 lukem Exp $
.include <bsd.own.mk>
@ -14,22 +14,20 @@ DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBZ}
.if (${USE_PAM} != "no")
CPPFLAGS+=-DUSE_PAM
.else # USE_PAM == no
.if (${USE_SKEY} != "no")
CPPFLAGS+=-DSKEY
.endif
.endif # USE_PAM == no
.if (${USE_KERBEROS} != "no")
CPPFLAGS+=-DGSSAPI -I${DESTDIR}/usr/include/gssapi
CPPFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/krb5 -DHEIMDAL
.endif
CPPFLAGS+=-DSUPPORT_UTMP -DSUPPORT_UTMPX
CPPFLAGS+=-DLIBWRAP
.if (${USE_SKEY} != "no")
CPPFLAGS+=-DSKEY
.endif
.if exists(${.CURDIR}/../../Makefile.inc)
.include "${.CURDIR}/../../Makefile.inc"
.endif

14
usr.bin/ssh/sshd/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.28 2006/03/20 04:03:23 christos Exp $
# $NetBSD: Makefile,v 1.29 2008/04/06 09:54:37 lukem Exp $
.include <bsd.own.mk>
@ -26,8 +26,15 @@ LDADD+= -lrpcsvc
DPADD+= ${LIBRPCSVC}
.endif
.else # USE_PAM == no
.if (${USE_SKEY} != "no")
LDADD+= -lskey
DPADD+= ${LIBSKEY}
.endif
.endif # USE_PAM == no
.if (${USE_KERBEROS} != "no")
SRCS += gss-genr.c auth2-gss.c gss-serv.c gss-serv-krb5.c
@ -52,8 +59,3 @@ DPADD+= ${LIBCRYPT} ${LIBUTIL}
LDADD+= -lwrap
DPADD+= ${LIBWRAP}
.if (${USE_SKEY} != "no")
LDADD+= -lskey
DPADD+= ${LIBSKEY}
.endif

6
usr.bin/su/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.48 2007/10/27 15:37:45 christos Exp $
# $NetBSD: Makefile,v 1.49 2008/04/06 09:54:37 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 7/19/93
.include <bsd.own.mk>
@ -23,7 +23,7 @@ DPADD+= ${LIBPAM} ${LIBCRYPT} ${LIBUTIL} ${PAM_STATIC_DPADD}
LDADD+= -lpam -lcrypt -lutil ${PAM_STATIC_LDADD}
SRCS=su_pam.c grutil.c suutil.c
.else
.else # USE_PAM == no
SRCS=su.c grutil.c suutil.c
@ -63,6 +63,6 @@ LDADD+= -lskey
CPPFLAGS+=-DSU_ROOTAUTH=\"${SU_ROOTAUTH}\"
.endif
.endif
.endif # USE_PAM == no
.include <bsd.prog.mk>