more cleanup of the sudo-ldap init.d handling

diff --git a/debian/changelog b/debian/changelog
index 4adfa243d5b29ff276c37cebd4533a03401e5c35..f6b3f97d67648f3147faa694d020bd1327e8feb0 100644 (file)
--- 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 b21073d071ac3afe00b3cf0f018942052afd675d..50b234cc9551d5061690f64d1b5a929dfe3296dd 100644 (file)
--- 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 36cdd235c89e4de80576edfa280def1318d16944..854f0ab5738a0c12252cdba76c3f41167c9dbe62 100644 (file)
--- 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