From: Bdale Garbee <bdale@gag.com>
Date: Tue, 5 Feb 2008 04:26:23 +0000 (-0700)
Subject: Imported Debian patch 1.6.9p11-2
X-Git-Tag: debian/1.6.9p11-2^0
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=826a6dd8a01381af7578c920a3d8808d06b2817d;p=debian%2Fsudo

Imported Debian patch 1.6.9p11-2
---

diff --git a/debian/changelog b/debian/changelog
index 159fb18..aa713ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sudo (1.6.9p11-2) unstable; urgency=low
+
+  * update version compared in preinst when removing obsolete init.d,
+    closes: #459681
+  * implement pam session config suggestions from Elizabeth Fong, 
+    closes: #452457, #402329
+
+ -- Bdale Garbee <bdale@gag.com>  Mon, 04 Feb 2008 21:26:23 -0700
+
 sudo (1.6.9p11-1) unstable; urgency=low
 
   * new upstream version
diff --git a/debian/preinst b/debian/preinst
index 25140b9..85d577e 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -19,7 +19,7 @@ rm_conffile() {
 
 case "$1" in
 install|upgrade)
-    if dpkg --compare-versions "$2" le 1.6.8p12-5; then
+    if dpkg --compare-versions "$2" le 1.6.9p11-2; then
         rm_conffile sudo /etc/init.d/sudo
         update-rc.d sudo remove
     fi
diff --git a/debian/sudo.pam b/debian/sudo.pam
index 814d913..cef0705 100644
--- a/debian/sudo.pam
+++ b/debian/sudo.pam
@@ -2,3 +2,6 @@
 
 @include common-auth
 @include common-account
+
+session required pam_permit.so
+session required pam_limits.so