From: Bdale Garbee <bdale@gag.com>
Date: Mon, 31 Aug 2009 18:08:29 +0000 (-0600)
Subject: add support for /etc/sudoers.d
X-Git-Tag: debian/1.7.2p1-1~14
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=48a84868d7dc224de7b42d8d6cd7707f2f60474d;p=debian%2Fsudo

add support for /etc/sudoers.d
---

diff --git a/debian/changelog b/debian/changelog
index 1582d67..b0dedc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sudo (1.7.2-3) UNRELEASED; urgency=low
+
+  * add support for /etc/sudoers.d using #includedir in default sudoers, 
+    closes: #539994
+
+ -- Bdale Garbee <bdale@gag.com>  Mon, 31 Aug 2009 12:08:04 -0600
+
 sudo (1.7.2-2) unstable; urgency=low
 
   * further improve initial sudoers to not include the NOPASSWD option on 
diff --git a/debian/sudo-ldap.postinst b/debian/sudo-ldap.postinst
index 5145cc9..9dea6d7 100644
--- a/debian/sudo-ldap.postinst
+++ b/debian/sudo-ldap.postinst
@@ -23,7 +23,9 @@ if ( ! -f "/etc/sudoers") {
 	  "# Allow members of group sudo to not need a password\n",
 	  "# (Note that later entries override this, so you might need to move\n",
           "# it further down)\n",
-	  "%sudo ALL=(ALL) ALL\n";
+	  "%sudo ALL=(ALL) ALL\n",
+	  "#\n",
+	  "#includedir /etc/sudoers.d\n";
 	close SUDOERS;
 
 }
@@ -32,7 +34,7 @@ if ( ! -f "/etc/sudoers") {
 system ('chown root:root /etc/sudoers');
 system ('chmod 440 /etc/sudoers');
 
-# do a remove first to un-do "bad" links created by previous versions
+# must do a remove first to un-do the "bad" links created by previous version
 system ('update-rc.d -f sudo remove >/dev/null 2>&1');
 
 system ('update-rc.d sudo start 75 S . >/dev/null');
diff --git a/debian/sudo.postinst b/debian/sudo.postinst
index c4f9482..6dc9cd2 100644
--- a/debian/sudo.postinst
+++ b/debian/sudo.postinst
@@ -23,7 +23,9 @@ if ( ! -f "/etc/sudoers") {
 	  "# Allow members of group sudo to not need a password\n",
 	  "# (Note that later entries override this, so you might need to move\n",
           "# it further down)\n",
-	  "%sudo ALL=(ALL) ALL\n";
+	  "%sudo ALL=(ALL) ALL\n",
+	  "#\n",
+	  "#includedir /etc/sudoers.d\n";
 	close SUDOERS;
 
 }