[23295] in Source-Commits
/svn/athena r22954 - trunk/debathena/config/pam-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Thu May 1 12:47:51 2008
Date: Thu, 1 May 2008 12:47:38 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200805011647.MAA22783@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-05-01 12:47:37 -0400 (Thu, 01 May 2008)
New Revision: 22954
Modified:
trunk/debathena/config/pam-config/debian/changelog
trunk/debathena/config/pam-config/debian/rules
trunk/debathena/config/pam-config/debian/transform_common-auth.debathena
trunk/debathena/config/pam-config/debian/transform_common-password.debathena
Log:
In pam-config:
* Check if common-* templates are available in /usr/share/pam/
* Handle pam_unix.so in temlate being requisitie instead of required.
Modified: trunk/debathena/config/pam-config/debian/changelog
===================================================================
--- trunk/debathena/config/pam-config/debian/changelog 2008-05-01 05:00:52 UTC (rev 22953)
+++ trunk/debathena/config/pam-config/debian/changelog 2008-05-01 16:47:37 UTC (rev 22954)
@@ -1,3 +1,10 @@
+debathena-pam-config (1.6) unstable; urgency=low
+
+ * Check if common-* templates are available in /usr/share/pam/
+ * Handle pam_unix.so in temlate being requisitie instead of required.
+
+ -- Tim Abbott <tabbott@mit.edu> Thu, 01 May 2008 12:46:42 -0400
+
debathena-pam-config (1.5) unstable; urgency=low
* Convert to use config-package.mk interface, new in config-package-
Modified: trunk/debathena/config/pam-config/debian/rules
===================================================================
--- trunk/debathena/config/pam-config/debian/rules 2008-05-01 05:00:52 UTC (rev 22953)
+++ trunk/debathena/config/pam-config/debian/rules 2008-05-01 16:47:37 UTC (rev 22954)
@@ -14,6 +14,13 @@
PAM_SSHD = /etc/pam.d/ssh.debathena
endif
+ifneq ($(wildcard /usr/share/pam/common-auth),)
+ DEB_CHECK_FILES_SOURCE_/etc/pam.d/common-auth.debathena = /usr/share/pam/common-auth
+ DEB_CHECK_FILES_SOURCE_/etc/pam.d/common-session.debathena = /usr/share/pam/common-session
+ DEB_CHECK_FILES_SOURCE_/etc/pam.d/common-account.debathena = /usr/share/pam/common-account
+ DEB_CHECK_FILES_SOURCE_/etc/pam.d/common-password.debathena = /usr/share/pam/common-password
+endif
+
DEB_TRANSFORM_FILES_debathena-pam-config += \
$(patsubst %,/etc/pam.d/common-%.debathena,$(pam_types)) \
/etc/pam.d/gdm.debathena \
Modified: trunk/debathena/config/pam-config/debian/transform_common-auth.debathena
===================================================================
--- trunk/debathena/config/pam-config/debian/transform_common-auth.debathena 2008-05-01 05:00:52 UTC (rev 22953)
+++ trunk/debathena/config/pam-config/debian/transform_common-auth.debathena 2008-05-01 16:47:37 UTC (rev 22954)
@@ -1,2 +1,2 @@
#!/usr/bin/perl -0p
-s/^(auth[ \t]+)required( ? ?)([ \t]+)(pam_unix\.so([ \t]+.*)?)\n/$1sufficient$3$4\n$1required$2$3pam_krb5.so use_first_pass\n/m or die;
+s/^(auth[ \t]+)(required|requisite)( ? ?)([ \t]+)(pam_unix\.so([ \t]+.*)?)\n/$1sufficient$4$5\n$1required$3$4pam_krb5.so use_first_pass\n/m or die;
Modified: trunk/debathena/config/pam-config/debian/transform_common-password.debathena
===================================================================
--- trunk/debathena/config/pam-config/debian/transform_common-password.debathena 2008-05-01 05:00:52 UTC (rev 22953)
+++ trunk/debathena/config/pam-config/debian/transform_common-password.debathena 2008-05-01 16:47:37 UTC (rev 22954)
@@ -1,2 +1,2 @@
#!/usr/bin/perl -0p
-s/^(password[ \t]+)required( ? ?)([ \t]+)(pam_unix\.so([ \t]+.*)?)\n/$1sufficient$3$4\n$1required$2$3pam_krb5.so use_first_pass\n/m or die;
+s/^(password[ \t]+)(required|requisite)( ? ?)([ \t]+)(pam_unix\.so([ \t]+.*)?)\n/$1sufficient$4$5\n$1required$3$4pam_krb5.so use_first_pass\n/m or die;
