From: Bdale Garbee <bdale@gag.com>
Date: Wed, 15 Jul 2009 07:10:33 +0000 (-0600)
Subject: fix two long-standing bugs in packaging
X-Git-Tag: debian/1.7.2-1~3
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=7a920628039c6a87504ed39b15371e3b6e649d6e;p=debian%2Fsudo

fix two long-standing bugs in packaging
---

diff --git a/debian/changelog b/debian/changelog
index bbd1665..5705482 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 sudo (1.7.2-1) UNRELEASED; urgency=low
 
   * new upstream version, closes: #537103
+  * improve initial sudoers commented-out example, closes: #536220
+  * fix update-rc.d call to create correct sudo-ldap link, closes: #387880
 
  -- Bdale Garbee <bdale@gag.com>  Wed, 15 Jul 2009 00:52:27 -0600
 
diff --git a/debian/sudo-ldap.postinst b/debian/sudo-ldap.postinst
index b89a8a5..d7184d5 100644
--- a/debian/sudo-ldap.postinst
+++ b/debian/sudo-ldap.postinst
@@ -23,7 +23,7 @@ if ( ! -f "/etc/sudoers") {
 	  "# Uncomment to 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=NOPASSWD: ALL\n";
+	  "# %sudo ALL=(ALL) NOPASSWD: ALL\n";
 	close SUDOERS;
 
 }
@@ -32,10 +32,10 @@ if ( ! -f "/etc/sudoers") {
 system ('chown root:root /etc/sudoers');
 system ('chmod 440 /etc/sudoers');
 
-# must do a remove first to un-do the "bad" links created by previous version
+# do a remove first to un-do "bad" links created by previous versions
 system ('update-rc.d -f sudo remove >/dev/null 2>&1');
 
-system ('update-rc.d sudo start 75 S . >/dev/null');
+system ('update-rc.d sudo-ldap start 75 S . >/dev/null');
 
 # make sure we have a sudo group
 
diff --git a/debian/sudo.postinst b/debian/sudo.postinst
index 2229c83..1494ccd 100644
--- a/debian/sudo.postinst
+++ b/debian/sudo.postinst
@@ -23,7 +23,7 @@ if ( ! -f "/etc/sudoers") {
 	  "# Uncomment to 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=NOPASSWD: ALL\n";
+	  "# %sudo ALL=(ALL) NOPASSWD: ALL\n";
 	close SUDOERS;
 
 }