X Strike Force XFree86 SVN commit: r1265 - trunk/debian
Author: branden
Date: 2004-04-16 21:32:41 -0500 (Fri, 16 Apr 2004)
New Revision: 1265
Modified:
trunk/debian/changelog
trunk/debian/control
trunk/debian/xdm.pam
Log:
Migrate xdm's PAM configuration to the New World Order. (Closes: #231589)
+ Use @include common-{auth,account,session,password} to load pam_unix.so
instead of doing so directly..
+ Load pam_nologin.so as a requisite auth module.
+ Load pam_limits.so as a required session module.
+ Make xdm depend on libpam-modules and libpam-runtime (>= 0.76-13.1).
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-17 02:18:09 UTC (rev 1264)
+++ trunk/debian/changelog 2004-04-17 02:32:41 UTC (rev 1265)
@@ -240,8 +240,15 @@
+ Use shell's && and || operators instead of test(1)'s -a and -o
operators, since the former is POSIX-compliant and the latter is not.
- -- Branden Robinson <branden@debian.org> Thu, 15 Apr 2004 15:29:22 -0500
+ * Migrate xdm's PAM configuration to the New World Order. (Closes: #231589)
+ + Use @include common-{auth,account,session,password} to load pam_unix.so
+ instead of doing so directly..
+ + Load pam_nologin.so as a requisite auth module.
+ + Load pam_limits.so as a required session module.
+ + Make xdm depend on libpam-modules and libpam-runtime (>= 0.76-13.1).
+ -- Branden Robinson <branden@debian.org> Thu, 15 Apr 2004 15:56:37 -0500
+
xfree86 (4.3.0-7) unstable; urgency=medium
* Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2004-04-17 02:18:09 UTC (rev 1264)
+++ trunk/debian/control 2004-04-17 02:32:41 UTC (rev 1265)
@@ -977,7 +977,7 @@
Package: xdm
Architecture: any
-Depends: debconf (>= 1.2.9), xbase-clients, cpp, ${shlibs:Depends}, ${misc:Depends}
+Depends: debconf (>= 1.2.9), xbase-clients, cpp, libpam-modules, libpam-runtime (>= 0.76-13.1), ${shlibs:Depends}, ${misc:Depends}
Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1)
Suggests: xutils
Replaces: xbase (<< 3.3.2.3a-2), xbase-clients (<< 4.0)
Modified: trunk/debian/xdm.pam
===================================================================
--- trunk/debian/xdm.pam 2004-04-17 02:18:09 UTC (rev 1264)
+++ trunk/debian/xdm.pam 2004-04-17 02:32:41 UTC (rev 1265)
@@ -1,7 +1,10 @@
-#%PAM-1.0
-auth required pam_nologin.so
+# $Id$
+
+@include common-auth
+@include common-account
+@include common-session
+@include common-password
+
+auth requisite pam_nologin.so
auth required pam_env.so
-auth required pam_unix.so nullok
-account required pam_unix.so
-password required pam_unix.so
-session required pam_unix.so
+session required pam_limits.so
Reply to: