xdm: Changes to 'debian-unstable'
debian/changelog | 3 +++
debian/xdm.pam | 10 +++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 8c79ab04f2b1024fe1ec8de3e7635c3ad7dfe6ac
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 10 16:18:41 2010 +0200
debian/xdm.pam: reorder pam modules
@include common-* after pam_env and friends, so that we still set env
vars if e.g. common-auth contains a 'sufficient' module (closes:
#444483).
diff --git a/debian/changelog b/debian/changelog
index 035fe6b..1908312 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ xdm (1:1.1.10-1) UNRELEASED; urgency=low
* Introduce virtual facility x-display-manager for insserv
(closes: #554839). Thanks, Jonas Meurer!
* debian/rules: kill gratuitous uses of $(CURDIR).
+ * debian/xdm.pam: @include common-* after pam_env and friends, so that we
+ still set env vars if e.g. common-auth contains a 'sufficient' module
+ (closes: #444483).
-- Julien Cristau <jcristau@debian.org> Sat, 10 Apr 2010 03:49:17 +0200
diff --git a/debian/xdm.pam b/debian/xdm.pam
index c8cf1b4..5d8df50 100644
--- a/debian/xdm.pam
+++ b/debian/xdm.pam
@@ -1,9 +1,9 @@
-@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_env.so envfile=/etc/default/locale
session required pam_limits.so
+
+@include common-auth
+@include common-account
+@include common-session
+@include common-password
Reply to: