Merge tag 'debian/1.8.5p2-1' into squeeze

[debian/sudo] / debian / sudo-ldap.postrm

diff --git a/debian/sudo-ldap.postrm b/debian/sudo-ldap.postrm
index 58bb84b57997e2b961c49cad1f59ec8b38fd8e8b..246f99dddf93905ace025ee07840e356d63756de 100644 (file)
--- a/debian/sudo-ldap.postrm
+++ b/debian/sudo-ldap.postrm
@@ -3,18 +3,28 @@
 case "$1" in
   purge)
        rm -f /etc/sudo-ldap.conf
+       rm -rf /var/lib/sudo
   ;;
 
   remove|upgrade|deconfigure)
   ;;
 
-  failed-upgrade)
+  abort-upgrade|failed-upgrade)
+    if [ -e "/etc/sudoers.pre-conffile" ]; then
+        mv /etc/sudoers.pre-conffile /etc/sudoers
+    fi
   ;;
 
+
   *)
         echo "unknown argument --> $1" >&2
         exit 0
   ;;
 esac
 
+# remove sudoers entries, if any, from nsswitch.conf
+if [ -w /etc/nsswitch.conf ] ; then
+       sed -i /^sudoers:/d /etc/nsswitch.conf
+fi
+
 #DEBHELPER#