Modern visudo locks the actual sudoers file, not the sudoers.tmp file.

Refer to sudoers.tmp as a temporary file, not a lock file.
Reported by Sander Bos

diff --git a/doc/visudo.cat b/doc/visudo.cat
index 6af90663f1702d1552ec54e541cac4c50914aa18..fe3be526084501afcc09a57f9ad6aa28ba2b8631 100644 (file)
--- a/doc/visudo.cat
+++ b/doc/visudo.cat
@@ -9,9 +9,9 @@ S\bSY\bYN\bNO\bOP\bPS\bSI\bIS\bS
 D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
      v\bvi\bis\bsu\bud\bdo\bo edits the _\bs_\bu_\bd_\bo_\be_\br_\bs file in a safe fashion, analogous to vipw(1m).
      v\bvi\bis\bsu\bud\bdo\bo locks the _\bs_\bu_\bd_\bo_\be_\br_\bs file against multiple simultaneous edits,
-     provides basic sanity checks, and checks for parse errors.  If the
-     _\bs_\bu_\bd_\bo_\be_\br_\bs file is currently being edited you will receive a message to try
-     again later.
+     provides basic sanity checks, and checks for parse errors before
+     installing the edited file.  If the _\bs_\bu_\bd_\bo_\be_\br_\bs file is currently being
+     edited you will receive a message to try again later.
 
      v\bvi\bis\bsu\bud\bdo\bo parses the _\bs_\bu_\bd_\bo_\be_\br_\bs file after editing and will not save the
      changes if there is a syntax error.  Upon finding an error, v\bvi\bis\bsu\bud\bdo\bo will
@@ -90,11 +90,11 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
                  Print the v\bvi\bis\bsu\bud\bdo\bo and _\bs_\bu_\bd_\bo_\be_\br_\bs grammar versions and exit.
 
      A _\bs_\bu_\bd_\bo_\be_\br_\bs file may be specified instead of the default, _\b/_\be_\bt_\bc_\b/_\bs_\bu_\bd_\bo_\be_\br_\bs.
-     The lock file used is the specified _\bs_\bu_\bd_\bo_\be_\br_\bs file with ".tmp" appended to
-     it.  In _\bc_\bh_\be_\bc_\bk_\b-_\bo_\bn_\bl_\by mode only, `-' may be used to indicate that _\bs_\bu_\bd_\bo_\be_\br_\bs
-     will be read from the standard input.  Because the policy is evaluated in
-     its entirety, it is not sufficient to check an individual _\bs_\bu_\bd_\bo_\be_\br_\bs include
-     file for syntax errors.
+     The temporary file used is the specified _\bs_\bu_\bd_\bo_\be_\br_\bs file with ".tmp"
+     appended to it.  In _\bc_\bh_\be_\bc_\bk_\b-_\bo_\bn_\bl_\by mode only, `-' may be used to indicate
+     that _\bs_\bu_\bd_\bo_\be_\br_\bs will be read from the standard input.  Because the policy is
+     evaluated in its entirety, it is not sufficient to check an individual
+     _\bs_\bu_\bd_\bo_\be_\br_\bs include file for syntax errors.
 
    D\bDe\beb\bbu\bug\bgg\bgi\bin\bng\bg a\ban\bnd\bd s\bsu\bud\bdo\boe\ber\brs\bs p\bpl\blu\bug\bgi\bin\bn a\bar\brg\bgu\bum\bme\ben\bnt\bts\bs
      v\bvi\bis\bsu\bud\bdo\bo versions 1.8.4 and higher support a flexible debugging framework
@@ -147,7 +147,7 @@ F\bFI\bIL\bLE\bES\bS
 
      _\b/_\be_\bt_\bc_\b/_\bs_\bu_\bd_\bo_\be_\br_\bs              List of who can run what
 
-     _\b/_\be_\bt_\bc_\b/_\bs_\bu_\bd_\bo_\be_\br_\bs_\b._\bt_\bm_\bp          Lock file for visudo
+     _\b/_\be_\bt_\bc_\b/_\bs_\bu_\bd_\bo_\be_\br_\bs_\b._\bt_\bm_\bp          Default temporary file used by visudo
 
 D\bDI\bIA\bAG\bGN\bNO\bOS\bST\bTI\bIC\bCS\bS
      In addition to reporting _\bs_\bu_\bd_\bo_\be_\br_\bs parse errors, v\bvi\bis\bsu\bud\bdo\bo may produce the
@@ -156,7 +156,7 @@ D\bDI\bIA\bAG\bGN\bNO\bOS\bST\bTI\bIC\bCS\bS
      sudoers file busy, try again later.
            Someone else is currently editing the _\bs_\bu_\bd_\bo_\be_\br_\bs file.
 
-     /etc/sudoers.tmp: Permission denied
+     /etc/sudoers: Permission denied
            You didn't run v\bvi\bis\bsu\bud\bdo\bo as root.
 
      you do not exist in the passwd database
@@ -223,4 +223,4 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
      file distributed with s\bsu\bud\bdo\bo or https://www.sudo.ws/license.html for
      complete details.
 
-Sudo 1.8.28                    December 24, 2018                   Sudo 1.8.28
+Sudo 1.8.28                      June 20, 2019                     Sudo 1.8.28

diff --git a/doc/visudo.man.in b/doc/visudo.man.in
index cfb0102481606888225382dafea097eaa9e53dab..746754cf7ca1a3d7b42addf98263ca68c1cdbcbc 100644 (file)
--- a/doc/visudo.man.in
+++ b/doc/visudo.man.in
@@ -2,7 +2,7 @@
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
-.\" Copyright (c) 1996,1998-2005, 2007-2018
+.\" Copyright (c) 1996,1998-2005, 2007-2019
 .\"    Todd C. Miller <Todd.Miller@sudo.ws>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -21,7 +21,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.TH "VISUDO" "@mansectsu@" "December 24, 2018" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
+.TH "VISUDO" "@mansectsu@" "June 20, 2019" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -42,7 +42,7 @@ vipw(@mansectsu@).
 locks the
 \fIsudoers\fR
 file against multiple simultaneous edits, provides basic sanity checks,
-and checks for parse errors.
+and checks for parse errors before installing the edited file.
 If the
 \fIsudoers\fR
 file is currently being edited you will receive a message to try again later.
@@ -72,8 +72,7 @@ option should be used with extreme caution because if
 \fBvisudo\fR
 believes there to be a parse error, so will
 \fBsudo\fR
-and no one
-will be able to run
+and no one will be able to run
 \fBsudo\fR
 again until the error is fixed.
 If
@@ -238,7 +237,7 @@ A
 \fIsudoers\fR
 file may be specified instead of the default,
 \fI@sysconfdir@/sudoers\fR.
-The lock file used is the specified
+The temporary file used is the specified
 \fIsudoers\fR
 file with
 \(lq\.tmp\(rq
@@ -352,7 +351,7 @@ Sudo front end configuration
 List of who can run what
 .TP 26n
 \fI@sysconfdir@/sudoers.tmp\fR
-Lock file for visudo
+Default temporary file used by visudo
 .SH "DIAGNOSTICS"
 In addition to reporting
 \fIsudoers\fR
@@ -365,7 +364,7 @@ Someone else is currently editing the
 \fIsudoers\fR
 file.
 .TP 6n
-\fR@sysconfdir@/sudoers.tmp: Permission denied\fR
+\fR@sysconfdir@/sudoers: Permission denied\fR
 You didn't run
 \fBvisudo\fR
 as root.

diff --git a/doc/visudo.mdoc.in b/doc/visudo.mdoc.in
index 41625ac013c1326370eef4d3a66078cd7f2e98d2..a9dc8ec1d7a04d2892aedc253f0d515db71d9786 100644 (file)
--- a/doc/visudo.mdoc.in
+++ b/doc/visudo.mdoc.in
@@ -1,7 +1,7 @@
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
-.\" Copyright (c) 1996,1998-2005, 2007-2018
+.\" Copyright (c) 1996,1998-2005, 2007-2019
 .\"    Todd C. Miller <Todd.Miller@sudo.ws>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -20,7 +20,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd December 24, 2018
+.Dd June 20, 2019
 .Dt VISUDO @mansectsu@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -40,7 +40,7 @@ file in a safe fashion, analogous to
 locks the
 .Em sudoers
 file against multiple simultaneous edits, provides basic sanity checks,
-and checks for parse errors.
+and checks for parse errors before installing the edited file.
 If the
 .Em sudoers
 file is currently being edited you will receive a message to try again later.
@@ -70,8 +70,7 @@ option should be used with extreme caution because if
 .Nm
 believes there to be a parse error, so will
 .Nm sudo
-and no one
-will be able to run
+and no one will be able to run
 .Nm sudo
 again until the error is fixed.
 If
@@ -232,7 +231,7 @@ A
 .Em sudoers
 file may be specified instead of the default,
 .Pa @sysconfdir@/sudoers .
-The lock file used is the specified
+The temporary file used is the specified
 .Em sudoers
 file with
 .Dq \.tmp
@@ -338,7 +337,7 @@ Sudo front end configuration
 .It Pa @sysconfdir@/sudoers
 List of who can run what
 .It Pa @sysconfdir@/sudoers.tmp
-Lock file for visudo
+Default temporary file used by visudo
 .El
 .Sh DIAGNOSTICS
 In addition to reporting
@@ -351,7 +350,7 @@ may produce the following messages:
 Someone else is currently editing the
 .Em sudoers
 file.
-.It Li @sysconfdir@/sudoers.tmp: Permission denied
+.It Li @sysconfdir@/sudoers: Permission denied
 You didn't run
 .Nm
 as root.