move temp file removal before possible exit point

[debian/sudo] / debian / sudo.postinst

diff --git a/debian/sudo.postinst b/debian/sudo.postinst
index c78cf8dae6c2b07b4e039f322080806a7f5e03ff..3d40784d54e238b8b2aca20c41a05c899259612c 100644 (file)
--- a/debian/sudo.postinst
+++ b/debian/sudo.postinst
@@ -4,30 +4,9 @@
 
 unlink ("/etc/alternatives/sudo") if ( -l "/etc/alternatives/sudo");
 
-# make sure we have a sudoers file
+# complain if no sudoers file is present
 if ( ! -f "/etc/sudoers") {
-
-       print "No /etc/sudoers found... creating one for you.\n";
-
-       open (SUDOERS, "> /etc/sudoers");
-       print SUDOERS "# /etc/sudoers\n",
-         "#\n",
-         "# This file MUST be edited with the 'visudo' command as root.\n",
-         "#\n",
-         "# See the man page for details on how to write a sudoers file.\n",
-         "#\n\nDefaults\tenv_reset\n\n",
-         "# Host alias specification\n\n",
-         "# User alias specification\n\n",
-         "# Cmnd alias specification\n\n",
-         "# User privilege specification\nroot\tALL=(ALL) ALL\n\n",
-         "# Allow members of group sudo to execute any command\n",
-         "# (Note that later entries override this, so you might need to move\n",
-          "# it further down)\n",
-         "%sudo ALL=(ALL) ALL\n",
-         "#\n",
-         "#includedir /etc/sudoers.d\n";
-       close SUDOERS;
-
+       print "WARNING:  /etc/sudoers not present!\n";
 }
 
 # handle state directory transition from /var/run/sudo to /var/lib/sudo,
@@ -47,6 +26,9 @@ system ('update-rc.d -f sudo remove >/dev/null 2>&1');
 
 system ('update-rc.d sudo start 75 2 3 4 5 . >/dev/null');
 
+# if we've gotten this far .. remove the saved, unchanged old sudoers file
+system ('rm -f /etc/sudoers.pre-conffile');
+
 # make sure we have a sudo group
 
 exit 0 if getgrnam("sudo"); # we're finished if there is a group sudo