Use /run in preference to /var/run if it exists.

Bug #822

diff --git a/INSTALL b/INSTALL
index 5b5826684467963ffa6c714677d9ddc7d8dd83d8..d15290a06edc188127bbc494d8b51fe455c40956 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -134,11 +134,11 @@ Directory and file names:
         do not survive a system reboot.  This is typically where
         the time stamp directory is located.  By default, configure
         will use the first existing directory in the following list:
-           /var/run, /var/db, /var/lib, /var/adm, /usr/adm
+           /run /var/run, /var/db, /var/lib, /var/adm, /usr/adm
        This directory should be cleared when the system reboots.
-       On systems that lack /var/run, the default rundir and vardir
-       may be the same.  In this case, only the ts directory inside
-       the rundir needs to be cleared at boot time.
+       On systems that lack /run or /var/run, the default rundir and
+       vardir may be the same.  In this case, only the ts directory
+       inside the rundir needs to be cleared at boot time.
 
   --with-vardir=DIR
         Set the directory to be used for sudo-specific files that

diff --git a/configure b/configure
index ba8da8f6c1ab0aec77798b71aea4c9d09de98d54..598170d54d64560c744f7f824abf7568023293ce 100755 (executable)
--- a/configure
+++ b/configure
@@ -25259,7 +25259,7 @@ fi
 $as_echo_n "checking for sudo run dir location... " >&6; }
 rundir="$with_rundir"
 if test -z "$rundir"; then
-    for d in /var/run /var/db /var/lib /var/adm /usr/adm; do
+    for d in /run /var/run /var/db /var/lib /var/adm /usr/adm; do
        if test -d "$d"; then
            rundir="$d/sudo"
            break
@@ -28659,7 +28659,7 @@ $as_echo "$as_me: You will need to customize examples/pam.conf and install it as
     esac
 fi
 case "$rundir" in
-    /var/run*)
+    /run/*|/var/run/*)
        clear_rundir=0
        ;;
     *)

diff --git a/configure.ac b/configure.ac
index d0ca587117284db63541d618643c7c5addddaa03..dda5e86fac4efe5aec14030e1600d527cf0a9c6c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4382,7 +4382,7 @@ dnl
 dnl Warn user if they may need to clear rundir manually.
 dnl
 case "$rundir" in
-    /var/run*)
+    /run/*|/var/run/*)
        clear_rundir=0
        ;;
     *)

diff --git a/doc/sudoers.cat b/doc/sudoers.cat
index ef0bb5b8725874b681af28ae0137617cb3262882..e2c9282e3255586a0fda4538b568d67f27d94fc4 100644 (file)
--- a/doc/sudoers.cat
+++ b/doc/sudoers.cat
@@ -2766,9 +2766,9 @@ S\bSE\bEC\bCU\bUR\bRI\bIT\bTY\bY N\bNO\bOT\bTE\bES\bS
      ownership of files they create.
 
      While the time stamp directory _\bs_\bh_\bo_\bu_\bl_\bd be cleared at reboot time, not all
-     systems contain a _\b/_\bv_\ba_\br_\b/_\br_\bu_\bn directory.  To avoid potential problems,
-     s\bsu\bud\bdo\boe\ber\brs\bs will ignore time stamp files that date from before the machine
-     booted on systems where the boot time is available.
+     systems contain a _\b/_\br_\bu_\bn or _\b/_\bv_\ba_\br_\b/_\br_\bu_\bn directory.  To avoid potential
+     problems, s\bsu\bud\bdo\boe\ber\brs\bs will ignore time stamp files that date from before the
+     machine booted on systems where the boot time is available.
 
      Some systems with graphical desktop environments allow unprivileged users
      to change the system clock.  Since s\bsu\bud\bdo\boe\ber\brs\bs relies on the system clock for
@@ -2897,4 +2897,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.23                    January 30, 2018                    Sudo 1.8.23
+Sudo 1.8.23                    February 19, 2018                   Sudo 1.8.23

diff --git a/doc/sudoers.man.in b/doc/sudoers.man.in
index be076b99c94e21638e4eaf23a5de1dd7c59a7bab..66e86fd7dc548b36652e3d2b972e9b53613ebf7c 100644 (file)
--- a/doc/sudoers.man.in
+++ b/doc/sudoers.man.in
@@ -21,7 +21,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.TH "SUDOERS" "5" "January 30, 2018" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
+.TH "SUDOERS" "5" "February 19, 2018" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -5484,6 +5484,8 @@ unprivileged users to change the ownership of files they create.
 While the time stamp directory
 \fIshould\fR
 be cleared at reboot time, not all systems contain a
+\fI/run\fR
+or
 \fI/var/run\fR
 directory.
 To avoid potential problems,

diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in
index 72deb07d012725215f1c6cfbe00df61de43d92fd..d319d9af337b0869aed21eae902e396b28fb084c 100644 (file)
--- a/doc/sudoers.mdoc.in
+++ b/doc/sudoers.mdoc.in
@@ -19,7 +19,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd January 30, 2018
+.Dd February 19, 2018
 .Dt SUDOERS @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -5075,6 +5075,8 @@ unprivileged users to change the ownership of files they create.
 While the time stamp directory
 .Em should
 be cleared at reboot time, not all systems contain a
+.Pa /run
+or
 .Pa /var/run
 directory.
 To avoid potential problems,

diff --git a/m4/sudo.m4 b/m4/sudo.m4
index 78edafb0b9c32abd55a533145d4b3393a2bdd378..6eda7d87a131f641d2bfdf5ee82a9a1f31679040 100644 (file)
--- a/m4/sudo.m4
+++ b/m4/sudo.m4
@@ -108,7 +108,7 @@ dnl
 AC_DEFUN([SUDO_RUNDIR], [AC_MSG_CHECKING(for sudo run dir location)
 rundir="$with_rundir"
 if test -z "$rundir"; then
-    for d in /var/run /var/db /var/lib /var/adm /usr/adm; do
+    for d in /run /var/run /var/db /var/lib /var/adm /usr/adm; do
        if test -d "$d"; then
            rundir="$d/sudo"
            break