Imported Debian patch 1.6.9p15-2

diff --git a/debian/OPTIONS b/debian/OPTIONS
index d40a2e74b82b694a240f5d8f5c08719c3506b256..35710ba4447e8193036eb2dfce2365599ca8bbdb 100644 (file)
--- a/debian/OPTIONS
+++ b/debian/OPTIONS
@@ -26,10 +26,10 @@ The following options were used to configure sudo for Debian GNU/Linux.
        Where logging information goes.
 
   --with-env-editor 
-  --with-editor=/usr/bin/vi
+  --with-editor=/usr/bin/editor
 
        Honor the EDITOR and VISUAL environment variables.  If they are not
-       present, default to the preferred vi alternative currently installed.
+       present, default to the preferred systemwide default editor.
 
   --with-timeout=15 
   --with-password-timeout=0 

diff --git a/debian/changelog b/debian/changelog
index ec13095be26cbcba91e970a06979e1f90a068f4c..87584cf07aa47b89f2aeb78f9044ddb27b514490 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+sudo (1.6.9p15-2) unstable; urgency=low
+
+  * revert the fix for 388659 such that visudo once again defaults to using
+    /usr/bin/editor.  I was always ambivalent about this change, it has caused
+    more confusion and frustration than it cured, and I find Justin's line of
+    reasoning persuasive.  Update the man page source to reflect this choice
+    and the related use of --with-env-editor.  Closes: #474197.
+  * patch from Petter Reinholdtsen to improve init.d, closes: #475821
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 16 Apr 2008 00:38:56 -0600
+
 sudo (1.6.9p15-1) unstable; urgency=low
 
   * new upstream version, closes: #467126, #473337

diff --git a/debian/rules b/debian/rules
index b57dae5820499cf5a0a2050a51c21064c9639c4c..365c062423976c8ce3e783d5309df25e4b21d6e1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ config-stamp:
                --with-all-insults \
                --with-devel --with-pam --with-fqdn \
                --with-logging=syslog --with-logfac=authpriv \
-               --with-env-editor --with-editor=/usr/bin/vi \
+               --with-env-editor --with-editor=/usr/bin/editor \
                --with-timeout=15 --with-password-timeout=0 \
                --with-passprompt="[sudo] password for %p: " \
                --disable-root-mailer --disable-setresuid \

diff --git a/visudo.man.in b/visudo.man.in
index 369caf651bad335596e97d3c3d50c75b431d94da..06877715a0440b6717c62e901e63c5c989608222 100644 (file)
--- a/visudo.man.in
+++ b/visudo.man.in
@@ -165,15 +165,19 @@ edited you will receive a message to try again later.
 .PP
 There is a hard-coded list of editors that \fBvisudo\fR will use set
 at compile-time that may be overridden via the \fIeditor\fR \fIsudoers\fR
-\&\f(CW\*(C`Default\*(C'\fR variable.  This list defaults to the path to \fIvi\fR\|(1) on
-your system, as determined by the \fIconfigure\fR script.  Normally,
-\&\fBvisudo\fR does not honor the \f(CW\*(C`VISUAL\*(C'\fR or \f(CW\*(C`EDITOR\*(C'\fR environment
+\&\f(CW\*(C`Default\*(C'\fR variable.  
+On Debian systems, this list defaults to /usr/bin/editor, which is meant to
+be a system-wide default editor chosen through the alternatives system.
+Normally, \&\fBvisudo\fR does not honor the \f(CW\*(C`VISUAL\*(C'\fR or 
+\f(CW\*(C`EDITOR\*(C'\fR environment
 variables unless they contain an editor in the aforementioned editors
 list.  However, if \fBvisudo\fR is configured with the \fI\-\-with\-enveditor\fR
 flag or the \fIenv_editor\fR \f(CW\*(C`Default\*(C'\fR variable is set in \fIsudoers\fR,
 \&\fBvisudo\fR will use any the editor defines by \f(CW\*(C`VISUAL\*(C'\fR or \f(CW\*(C`EDITOR\*(C'\fR.
 Note that this can be a security hole since it allows the user to
 execute any program they wish simply by setting \f(CW\*(C`VISUAL\*(C'\fR or \f(CW\*(C`EDITOR\*(C'\fR.
+Despite this potential risk, sudo on Debian is compiled with the
+\fI\-\-with\-enveditor\fR flag.
 .PP
 \&\fBvisudo\fR parses the \fIsudoers\fR file after the edit and will
 not save the changes if there is a syntax error.  Upon finding