change path specification to avoid complaints when /var/run/sudo exists but

[debian/sudo] / visudo.cat

diff --git a/visudo.cat b/visudo.cat
index d46fb5481c92db34f31a244a8cb8c03aa318c4ce..c99374f8f302d4148c6ed804cc8064d9ddb23c4c 100644 (file)
--- a/visudo.cat
+++ b/visudo.cat
@@ -17,17 +17,16 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
        _\bs_\bu_\bd_\bo_\be_\br_\bs file is currently being edited you will receive a message to
        try again later.
 
-       There is a hard-coded list of editors that v\bvi\bis\bsu\bud\bdo\bo will use set at
-       compile-time that may be overridden via the _\be_\bd_\bi_\bt_\bo_\br _\bs_\bu_\bd_\bo_\be_\br_\bs Default
-       variable.  This list defaults to the path to _\bv_\bi(1) on your system, as
-       determined by the _\bc_\bo_\bn_\bf_\bi_\bg_\bu_\br_\be script.  Normally, v\bvi\bis\bsu\bud\bdo\bo does not honor
-       the VISUAL or EDITOR environment variables unless they contain an
-       editor in the aforementioned editors list.  However, if v\bvi\bis\bsu\bud\bdo\bo is
-       configured with the _\b-_\b-_\bw_\bi_\bt_\bh_\b-_\be_\bn_\bv_\be_\bd_\bi_\bt_\bo_\br option or the _\be_\bn_\bv_\b__\be_\bd_\bi_\bt_\bo_\br Default
-       variable is set in _\bs_\bu_\bd_\bo_\be_\br_\bs, v\bvi\bis\bsu\bud\bdo\bo will use any the editor defines by
-       VISUAL or EDITOR.  Note that this can be a security hole since it
-       allows the user to execute any program they wish simply by setting
-       VISUAL or EDITOR.
+       There is a hard-coded list of one or more editors that v\bvi\bis\bsu\bud\bdo\bo will use
+       set at compile-time that may be overridden via the _\be_\bd_\bi_\bt_\bo_\br _\bs_\bu_\bd_\bo_\be_\br_\bs
+       Default variable.  This list defaults to "vi".  Normally, v\bvi\bis\bsu\bud\bdo\bo does
+       not honor the VISUAL or EDITOR environment variables unless they
+       contain an editor in the aforementioned editors list.  However, if
+       v\bvi\bis\bsu\bud\bdo\bo is configured with the _\b-_\b-_\bw_\bi_\bt_\bh_\b-_\be_\bn_\bv_\b-_\be_\bd_\bi_\bt_\bo_\br option or the
+       _\be_\bn_\bv_\b__\be_\bd_\bi_\bt_\bo_\br Default variable is set in _\bs_\bu_\bd_\bo_\be_\br_\bs, v\bvi\bis\bsu\bud\bdo\bo will use any the
+       editor defines by VISUAL or EDITOR.  Note that this can be a security
+       hole since it allows the user to execute any program they wish simply
+       by setting VISUAL or EDITOR.
 
        v\bvi\bis\bsu\bud\bdo\bo parses the _\bs_\bu_\bd_\bo_\be_\br_\bs file after the edit and will not save the
        changes if there is a syntax error.  Upon finding an error, v\bvi\bis\bsu\bud\bdo\bo will
@@ -58,10 +57,11 @@ O\bOP\bPT\bTI\bIO\bON\bNS\bS
                    appended to it.
 
        -q          Enable q\bqu\bui\bie\bet\bt mode.  In this mode details about syntax
+                   errors are not printed.  This option is only useful when
 
 
 
-1.7.2p6                   March  3, 2010                        1
+1.7.4                     July 14, 2010                         1
 
 
 
@@ -70,13 +70,12 @@ O\bOP\bPT\bTI\bIO\bON\bNS\bS
 VISUDO(1m)             MAINTENANCE COMMANDS            VISUDO(1m)
 
 
-                   errors are not printed.  This option is only useful when
                    combined with the -\b-c\bc option.
 
        -s          Enable s\bst\btr\bri\bic\bct\bt checking of the _\bs_\bu_\bd_\bo_\be_\br_\bs file.  If an alias is
                    used before it is defined, v\bvi\bis\bsu\bud\bdo\bo will consider this a
                    parse error.  Note that it is not possible to differentiate
-                   between an alias and a hostname or username that consists
+                   between an alias and a host name or user name that consists
                    solely of uppercase letters, digits, and the underscore
                    ('_') character.
 
@@ -108,7 +107,7 @@ D\bDI\bIA\bAG\bGN\bNO\bOS\bST\bTI\bIC\bCS\bS
 
        Warning: {User,Runas,Host,Cmnd}_Alias referenced but not defined
            Either you are trying to use an undeclare
-           {User,Runas,Host,Cmnd}_Alias or you have a user or hostname listed
+           {User,Runas,Host,Cmnd}_Alias or you have a user or host name listed
            that consists solely of uppercase letters, digits, and the
            underscore ('_') character.  In the latter case, you can ignore the
            warnings (s\bsu\bud\bdo\bo will not complain).  In -\b-s\bs (strict) mode these are
@@ -124,10 +123,11 @@ S\bSE\bEE\bE A\bAL\bLS\bSO\bO
 
 A\bAU\bUT\bTH\bHO\bOR\bR
        Many people have worked on _\bs_\bu_\bd_\bo over the years; this version of v\bvi\bis\bsu\bud\bdo\bo
+       was written by:
 
 
 
-1.7.2p6                   March  3, 2010                        2
+1.7.4                     July 14, 2010                         2
 
 
 
@@ -136,8 +136,6 @@ A\bAU\bUT\bTH\bHO\bOR\bR
 VISUDO(1m)             MAINTENANCE COMMANDS            VISUDO(1m)
 
 
-       was written by:
-
         Todd Miller
 
        See the HISTORY file in the sudo distribution or visit
@@ -193,6 +191,8 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
 
 
 
-1.7.2p6                   March  3, 2010                        3
+
+
+1.7.4                     July 14, 2010                         3