From: Bdale Garbee <bdale@gag.com>
Date: Sun, 6 Jul 2008 06:43:53 +0000 (-0600)
Subject: more cleanup of the sudo-ldap init.d handling
X-Git-Tag: debian/1.6.9p17-1~4
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=2021aeda1ef59e5cc257c760e6056c39f71226a8;p=debian%2Fsudo

more cleanup of the sudo-ldap init.d handling
---

diff --git a/debian/changelog b/debian/changelog
index 4adfa24..f6b3f97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ sudo (1.6.9p16-1) UNRELEASED; urgency=low
   * deliver schemas to doc directory in sudo-ldap package, closes: #474331
   * re-apply patch from Petter Reinholdtsen to improve init.d apparently lost
     in move from CVS to git for package management, closes: #475821
+  * re-instate the init.d for the sudo-ldap package too... /o\
 
  -- Bdale Garbee <bdale@gag.com>  Sat, 05 Jul 2008 23:44:08 -0600
 
diff --git a/debian/sudo-ldap.lintian b/debian/sudo-ldap.lintian
index b21073d..50b234c 100644
--- a/debian/sudo-ldap.lintian
+++ b/debian/sudo-ldap.lintian
@@ -1,2 +1,4 @@
 sudo-ldap: setuid-binary usr/bin/sudo 4755 root/root
 sudo-ldap: setuid-binary usr/bin/sudoedit 4755 root/root
+sudo-ldap: postrm-contains-additional-updaterc.d-calls /etc/init.d/sudo
+sudo-ldap: script-in-etc-init.d-not-registered-via-update-rc.d /etc/init.d/sudo
diff --git a/debian/sudo-ldap.postinst b/debian/sudo-ldap.postinst
index 36cdd23..854f0ab 100644
--- a/debian/sudo-ldap.postinst
+++ b/debian/sudo-ldap.postinst
@@ -31,9 +31,9 @@ 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
-system ('update-rc.d -f sudo remove >/dev/null 2>&1');
+system ('update-rc.d -f sudo-ldap 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