Be clear that #includedir diverts control to the files in the

specified directory and, when parsing of those files is complete,
returns control to the original file.  Bug #775

diff --git a/doc/sudoers.cat b/doc/sudoers.cat
index b880ee45e972c93b270c5522cfd55b71a1782bbd..a647432e17b32252630d4bdd6cac40cc7407c957 100644 (file)
--- a/doc/sudoers.cat
+++ b/doc/sudoers.cat
@@ -852,14 +852,17 @@ S\bSU\bUD\bDO\bOE\bER\bRS\bS F\bFI\bIL\bLE\bE F\bFO\bOR\bRM\bMA\bAT\bT
 
          #includedir /etc/sudoers.d
 
-     s\bsu\bud\bdo\bo will read each file in _\b/_\be_\bt_\bc_\b/_\bs_\bu_\bd_\bo_\be_\br_\bs_\b._\bd, skipping file names that end
-     in `~' or contain a `.' character to avoid causing problems with package
-     manager or editor temporary/backup files.  Files are parsed in sorted
-     lexical order.  That is, _\b/_\be_\bt_\bc_\b/_\bs_\bu_\bd_\bo_\be_\br_\bs_\b._\bd_\b/_\b0_\b1_\b__\bf_\bi_\br_\bs_\bt will be parsed before
+     s\bsu\bud\bdo\bo will suspend processing of the current file and read each file in
+     _\b/_\be_\bt_\bc_\b/_\bs_\bu_\bd_\bo_\be_\br_\bs_\b._\bd, skipping file names that end in `~' or contain a `.'
+     character to avoid causing problems with package manager or editor
+     temporary/backup files.  Files are parsed in sorted lexical order.  That
+     is, _\b/_\be_\bt_\bc_\b/_\bs_\bu_\bd_\bo_\be_\br_\bs_\b._\bd_\b/_\b0_\b1_\b__\bf_\bi_\br_\bs_\bt will be parsed before
      _\b/_\be_\bt_\bc_\b/_\bs_\bu_\bd_\bo_\be_\br_\bs_\b._\bd_\b/_\b1_\b0_\b__\bs_\be_\bc_\bo_\bn_\bd.  Be aware that because the sorting is lexical,
      not numeric, _\b/_\be_\bt_\bc_\b/_\bs_\bu_\bd_\bo_\be_\br_\bs_\b._\bd_\b/_\b1_\b__\bw_\bh_\bo_\bo_\bp_\bs would be loaded _\ba_\bf_\bt_\be_\br
      _\b/_\be_\bt_\bc_\b/_\bs_\bu_\bd_\bo_\be_\br_\bs_\b._\bd_\b/_\b1_\b0_\b__\bs_\be_\bc_\bo_\bn_\bd.  Using a consistent number of leading zeroes in
-     the file names can be used to avoid such problems.
+     the file names can be used to avoid such problems.  After parsing the
+     files in the directory, control returns to the file that contained the
+     #includedir directive.
 
      Note that unlike files included via #include, v\bvi\bis\bsu\bud\bdo\bo will not edit the
      files in a #includedir directory unless one of them contains a syntax
@@ -2810,4 +2813,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.20                       May 3, 2017                      Sudo 1.8.20
+Sudo 1.8.20                       May 8, 2017                      Sudo 1.8.20

diff --git a/doc/sudoers.man.in b/doc/sudoers.man.in
index 2ebed460e3b07d1b122eebfc10da23787f49128c..18de06b835cf83204188b0ddf26a519b54a1001f 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" "May 3, 2017" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
+.TH "SUDOERS" "5" "May 8, 2017" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -1819,7 +1819,7 @@ For example, given:
 .fi
 .PP
 \fBsudo\fR
-will read each file in
+will suspend processing of the current file and read each file in
 \fI/etc/sudoers.d\fR,
 skipping file names that end in
 \(oq~\(cq
@@ -1839,6 +1839,10 @@ would be loaded
 \fI/etc/sudoers.d/10_second\fR.
 Using a consistent number of leading zeroes in the file names can be used
 to avoid such problems.
+After parsing the files in the directory, control returns to the
+file that contained the
+\fR#includedir\fR
+directive.
 .PP
 Note that unlike files included via
 \fR#include\fR,

diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in
index f902b9d2d2068c59343a88ce15864bd1c1832c0a..a69a7acc5d29151869935e09458f7ceb654084d5 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 May 3, 2017
+.Dd May 8, 2017
 .Dt SUDOERS @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -1695,7 +1695,7 @@ For example, given:
 .Ed
 .Pp
 .Nm sudo
-will read each file in
+will suspend processing of the current file and read each file in
 .Pa /etc/sudoers.d ,
 skipping file names that end in
 .Ql ~
@@ -1715,6 +1715,10 @@ would be loaded
 .Pa /etc/sudoers.d/10_second .
 Using a consistent number of leading zeroes in the file names can be used
 to avoid such problems.
+After parsing the files in the directory, control returns to the
+file that contained the
+.Li #includedir
+directive.
 .Pp
 Note that unlike files included via
 .Li #include ,