Document that fqdn, runas_default and sudoers_locale are parsed early.

diff --git a/doc/sudoers.cat b/doc/sudoers.cat
index 88d1217422b85ca447eb2f2c3f7e732c106d095f..33d5765460fdc72c9628841d04c3c6adefcf2c8d 100644 (file)
--- a/doc/sudoers.cat
+++ b/doc/sudoers.cat
@@ -458,6 +458,10 @@ S\bSU\bUD\bDO\bOE\bER\bRS\bS F\bFI\bIL\bLE\bE F\bFO\bOR\bRM\bMA\bAT\bT
 
      Defaults entries are parsed in the following order: generic, host and
      user Defaults first, then runas Defaults and finally command defaults.
+     If there are multiple Defaults settings of the same type, the last
+     matching setting is used.  The following Defaults settings are parsed
+     before all others since they may affect subsequent entries: _\bf_\bq_\bd_\bn,
+     _\br_\bu_\bn_\ba_\bs_\b__\bd_\be_\bf_\ba_\bu_\bl_\bt, _\bs_\bu_\bd_\bo_\be_\br_\bs_\b__\bl_\bo_\bc_\ba_\bl_\be.
 
      See _\bS_\bU_\bD_\bO_\bE_\bR_\bS _\bO_\bP_\bT_\bI_\bO_\bN_\bS for a list of supported Defaults parameters.
 
@@ -2539,4 +2543,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.18                    January 20, 2016                    Sudo 1.8.18
+Sudo 1.8.18                     August 9, 2016                     Sudo 1.8.18

diff --git a/doc/sudoers.man.in b/doc/sudoers.man.in
index 8a6644f109686e966ee99b40ce4d486cc237c00f..052ec9a223ae1b4865f24936829e24afd17e90a2 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 20, 2016" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
+.TH "SUDOERS" "5" "August 9, 2016" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -957,6 +957,13 @@ that does not exist in a list.
 Defaults entries are parsed in the following order: generic, host
 and user Defaults first, then runas Defaults and finally command
 defaults.
+If there are multiple Defaults settings of the same type, the last
+matching setting is used.
+The following Defaults settings are parsed before all others since
+they may affect subsequent entries:
+\fIfqdn\fR,
+\fIrunas_default\fR,
+\fIsudoers_locale\fR.
 .PP
 See
 \fISUDOERS OPTIONS\fR

diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in
index 57921605acd1e14734406257230edc88c1cab5f7..74508d0d7bf36c22cadfcc373aa922e65bb2b8a1 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 20, 2016
+.Dd August 9, 2016
 .Dt SUDOERS @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -911,6 +911,13 @@ that does not exist in a list.
 Defaults entries are parsed in the following order: generic, host
 and user Defaults first, then runas Defaults and finally command
 defaults.
+If there are multiple Defaults settings of the same type, the last
+matching setting is used.
+The following Defaults settings are parsed before all others since
+they may affect subsequent entries:
+.Em fqdn ,
+.Em runas_default ,
+.Em sudoers_locale .
 .Pp
 See
 .Sx SUDOERS OPTIONS