[Midnightbsd-cvs] src [11773] U trunk/etc/pam.d: make some of these conditional

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Jul 11 12:33:03 EDT 2018


Revision: 11773
          http://svnweb.midnightbsd.org/src/?rev=11773
Author:   laffer1
Date:     2018-07-11 12:33:02 -0400 (Wed, 11 Jul 2018)
Log Message:
-----------
make some of these conditional

Modified Paths:
--------------
    trunk/etc/pam.d/Makefile
    trunk/etc/pam.d/README
    trunk/etc/pam.d/atrun
    trunk/etc/pam.d/cron
    trunk/etc/pam.d/ftpd
    trunk/etc/pam.d/gdm
    trunk/etc/pam.d/imap
    trunk/etc/pam.d/kde
    trunk/etc/pam.d/login
    trunk/etc/pam.d/other
    trunk/etc/pam.d/passwd
    trunk/etc/pam.d/pop3
    trunk/etc/pam.d/rsh
    trunk/etc/pam.d/sshd
    trunk/etc/pam.d/su
    trunk/etc/pam.d/system
    trunk/etc/pam.d/telnetd
    trunk/etc/pam.d/xdm

Property Changed:
----------------
    trunk/etc/pam.d/README
    trunk/etc/pam.d/atrun
    trunk/etc/pam.d/cron
    trunk/etc/pam.d/ftpd
    trunk/etc/pam.d/gdm
    trunk/etc/pam.d/imap
    trunk/etc/pam.d/kde
    trunk/etc/pam.d/login
    trunk/etc/pam.d/other
    trunk/etc/pam.d/passwd
    trunk/etc/pam.d/pop3
    trunk/etc/pam.d/rsh
    trunk/etc/pam.d/sshd
    trunk/etc/pam.d/su
    trunk/etc/pam.d/system
    trunk/etc/pam.d/telnetd
    trunk/etc/pam.d/xdm

Modified: trunk/etc/pam.d/Makefile
===================================================================
--- trunk/etc/pam.d/Makefile	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/Makefile	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,11 +1,11 @@
-# $MidnightBSD: src/etc/pam.d/Makefile,v 1.4 2008/12/04 20:00:37 laffer1 Exp $
-# $FreeBSD: src/etc/pam.d/Makefile,v 1.13 2005/06/10 20:52:36 nectar Exp $
+# $MidnightBSD$
 
+.include <bsd.own.mk>
+
 NO_OBJ=
+
 FILES=	README \
-	atrun \
 	cron \
-	ftpd \
 	gdm \
 	imap \
 	kde \
@@ -14,12 +14,23 @@
 	passwd pop3 \
 	rsh \
 	sshd su system \
-	telnetd \
 	xdm
 
+.if ${MK_AT} != "no"
+FILES+=	atrun
+.endif
+
+.if ${MK_FTP} != "no"
+FILES+=	ftpd
+LINKS=	${FILESDIR}/ftpd ${FILESDIR}/ftp
+.endif
+
+.if ${MK_TELNET} != "no"
+FILES+=	telnetd
+.endif
+
 FILESDIR=	/etc/pam.d
 FILESMODE=	644
 FILESMODE_README=	444
-LINKS=	${FILESDIR}/ftpd ${FILESDIR}/ftp
 
 .include <bsd.prog.mk>

Modified: trunk/etc/pam.d/README
===================================================================
--- trunk/etc/pam.d/README	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/README	2018-07-11 16:33:02 UTC (rev 11773)
@@ -8,7 +8,7 @@
 file does not exist, /etc/pam.conf is searched for entries matching
 the specified service or, failing that, the "other" service.
 
-See the pam(8) manual page for an explanation of the workings of the
+See the pam(3) manual page for an explanation of the workings of the
 PAM library and descriptions of the various files and modules.  Below
 is a summary of the format for the pam.conf and /etc/pam.d/* files.
 
@@ -59,4 +59,4 @@
 To get the intended semantics, add a "required" entry listing the
 pam_deny module at the end of the chain.
 
-$MidnightBSD: src/etc/pam.d/README,v 1.2 2006/08/28 01:35:55 laffer1 Exp $
+$MidnightBSD$


Property changes on: trunk/etc/pam.d/README
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/etc/pam.d/atrun
===================================================================
--- trunk/etc/pam.d/atrun	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/atrun	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/etc/pam.d/atrun,v 1.2 2008/12/09 22:13:10 laffer1 Exp $
+# $MidnightBSD$
 #
 # PAM configuration for the "atrun" service
 #


Property changes on: trunk/etc/pam.d/atrun
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/etc/pam.d/cron
===================================================================
--- trunk/etc/pam.d/cron	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/cron	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/etc/pam.d/cron,v 1.1 2007/08/18 07:40:09 laffer1 Exp $
+# $MidnightBSD$
 #
 # PAM configuration for the "cron" service
 #


Property changes on: trunk/etc/pam.d/cron
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/etc/pam.d/ftpd
===================================================================
--- trunk/etc/pam.d/ftpd	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/ftpd	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/etc/pam.d/ftpd,v 1.3 2008/12/09 22:11:19 laffer1 Exp $
+# $MidnightBSD$
 #
 # PAM configuration for the "ftpd" service
 #
@@ -7,7 +7,7 @@
 auth		sufficient	pam_opie.so		no_warn no_fake_prompts
 auth		requisite	pam_opieaccess.so	no_warn allow_local
 #auth		sufficient	pam_krb5.so		no_warn
-#auth           sufficient      pam_ssh.so		no_warn try_first_pass
+#auth		sufficient	pam_ssh.so		no_warn try_first_pass
 auth		required	pam_unix.so		no_warn try_first_pass
 
 # account


Property changes on: trunk/etc/pam.d/ftpd
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/etc/pam.d/gdm
===================================================================
--- trunk/etc/pam.d/gdm	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/gdm	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/etc/pam.d/gdm,v 1.3 2008/12/09 22:11:19 laffer1 Exp $
+# $MidnightBSD$
 #
 # PAM configuration for the "gdm" service
 #


Property changes on: trunk/etc/pam.d/gdm
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/etc/pam.d/imap
===================================================================
--- trunk/etc/pam.d/imap	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/imap	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/etc/pam.d/imap,v 1.3 2008/12/09 22:11:19 laffer1 Exp $
+# $MidnightBSD$
 #
 # PAM configuration for the "imap" service
 #


Property changes on: trunk/etc/pam.d/imap
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/etc/pam.d/kde
===================================================================
--- trunk/etc/pam.d/kde	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/kde	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/etc/pam.d/kde,v 1.3 2008/12/09 22:11:19 laffer1 Exp $
+# $MidnightBSD$
 #
 # PAM configuration for the "kde" service
 #


Property changes on: trunk/etc/pam.d/kde
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/etc/pam.d/login
===================================================================
--- trunk/etc/pam.d/login	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/login	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/etc/pam.d/login,v 1.3 2008/12/09 22:11:19 laffer1 Exp $
+# $MidnightBSD$
 #
 # PAM configuration for the "login" service
 #


Property changes on: trunk/etc/pam.d/login
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/etc/pam.d/other
===================================================================
--- trunk/etc/pam.d/other	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/other	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/etc/pam.d/other,v 1.3 2008/12/09 22:11:19 laffer1 Exp $
+# $MidnightBSD$
 #
 # PAM configuration for the "other" service
 #


Property changes on: trunk/etc/pam.d/other
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/etc/pam.d/passwd
===================================================================
--- trunk/etc/pam.d/passwd	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/passwd	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/etc/pam.d/passwd,v 1.2 2006/08/28 01:35:55 laffer1 Exp $
+# $MidnightBSD$
 #
 # PAM configuration for the "passwd" service
 #


Property changes on: trunk/etc/pam.d/passwd
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/etc/pam.d/pop3
===================================================================
--- trunk/etc/pam.d/pop3	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/pop3	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/etc/pam.d/pop3,v 1.3 2008/12/09 22:11:19 laffer1 Exp $
+# $MidnightBSD$
 #
 # PAM configuration for the "pop3" service
 #


Property changes on: trunk/etc/pam.d/pop3
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/etc/pam.d/rsh
===================================================================
--- trunk/etc/pam.d/rsh	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/rsh	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/etc/pam.d/rsh,v 1.3 2008/12/09 22:11:19 laffer1 Exp $
+# $MidnightBSD$
 #
 # PAM configuration for the "rsh" service
 #


Property changes on: trunk/etc/pam.d/rsh
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/etc/pam.d/sshd
===================================================================
--- trunk/etc/pam.d/sshd	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/sshd	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/etc/pam.d/sshd,v 1.3 2007/08/18 08:00:38 laffer1 Exp $
+# $MidnightBSD$
 # $FreeBSD: src/etc/pam.d/sshd,v 1.15 2003/04/30 21:57:54 markm Exp $
 #
 # PAM configuration for the "sshd" service


Property changes on: trunk/etc/pam.d/sshd
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/etc/pam.d/su
===================================================================
--- trunk/etc/pam.d/su	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/su	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/etc/pam.d/su,v 1.2 2006/08/28 01:35:55 laffer1 Exp $
+# $MidnightBSD$
 #
 # PAM configuration for the "su" service
 #


Property changes on: trunk/etc/pam.d/su
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/etc/pam.d/system
===================================================================
--- trunk/etc/pam.d/system	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/system	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/etc/pam.d/system,v 1.2 2006/08/28 01:35:55 laffer1 Exp $
+# $MidnightBSD$
 # $FreeBSD: src/etc/pam.d/system,v 1.1 2003/06/14 12:35:05 des Exp $
 #
 # System-wide defaults


Property changes on: trunk/etc/pam.d/system
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/etc/pam.d/telnetd
===================================================================
--- trunk/etc/pam.d/telnetd	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/telnetd	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/etc/pam.d/telnetd,v 1.3 2008/12/09 22:11:19 laffer1 Exp $
+# $MidnightBSD$
 # $FreeBSD: src/etc/pam.d/telnetd,v 1.7 2003/04/30 21:57:54 markm Exp $
 #
 # PAM configuration for the "telnetd" service


Property changes on: trunk/etc/pam.d/telnetd
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/etc/pam.d/xdm
===================================================================
--- trunk/etc/pam.d/xdm	2018-07-11 16:29:59 UTC (rev 11772)
+++ trunk/etc/pam.d/xdm	2018-07-11 16:33:02 UTC (rev 11773)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/etc/pam.d/xdm,v 1.3 2008/12/09 22:11:19 laffer1 Exp $
+# $MidnightBSD$
 # $FreeBSD: src/etc/pam.d/xdm,v 1.10 2005/04/28 07:59:09 des Exp $
 #
 # PAM configuration for the "xdm" service


Property changes on: trunk/etc/pam.d/xdm
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list