From cd258e1d39d45a3c9316e8a03619d811afe54ecb Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Wed, 3 Jul 2019 09:06:45 -0600
Subject: [PATCH] Add conditional for sesh path in sudo.conf manual.

---
 doc/Makefile.in       | 2 +-
 doc/sudo.conf.man.in  | 9 ++++++---
 doc/sudo.conf.mdoc.in | 9 ++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 880949381..469246a57 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -160,7 +160,7 @@ $(srcdir)/sudo.conf.man.in: $(srcdir)/sudo.conf.mdoc.in
 	    echo "Generating $@"; \
 	    mansectsu=`echo @MANSECTSU@|$(TR) A-Z a-z`; \
 	    mansectform=`echo @MANSECTFORM@|$(TR) A-Z a-z`; \
-	    $(SED) -e "s/$$mansectsu/8/g" -e "s/$$mansectform/5/g" $(srcdir)/sudo.conf.mdoc.in | $(MANDOC) -Tman | $(SED) -e 's/^\(\.TH "SUDO.CONF" \)"5"\(.*\)/\1"'$$mansectform'"\2/' -e "s/(5)/($$mansectform)/g" -e "s/(8)/($$mansectsu)/g" > $@; \
+	    $(SED) -e 's/^\(\.nr [A-Z][A-Z]\) .[A-Z][A-Z]MAN./\1 1/' -e "s/$$mansectsu/8/g" -e "s/$$mansectform/5/g" $(srcdir)/sudo.conf.mdoc.in | $(MANDOC) -Tman | $(SED) -e 's/^\(\.TH "SUDO.CONF" \)"5"\(.*\)/\1"'$$mansectform'"\2/' -e "s/(5)/($$mansectform)/g" -e "s/(8)/($$mansectsu)/g" -f $(srcdir)/sudo.conf.man.in.sed > $@; \
 	fi
 
 $(mansrcdir)/sudo.conf.man: $(top_builddir)/config.status $(srcdir)/sudo.conf.man.in fixman.sed
diff --git a/doc/sudo.conf.man.in b/doc/sudo.conf.man.in
index 51fde9578..406c37d70 100644
--- a/doc/sudo.conf.man.in
+++ b/doc/sudo.conf.man.in
@@ -16,7 +16,8 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.TH "SUDO.CONF" "@mansectform@" "June 20, 2019" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
+.nr SL @SEMAN@
+.TH "SUDO.CONF" "@mansectform@" "July 3, 2019" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -251,7 +252,7 @@ If terminal devices may be located in a sub-directory of
 \fI/dev\fR,
 that path must be explicitly listed in
 \fIdevsearch\fR.
-The default value is:
+The default value is
 \fR/dev/pts:/dev/vt:/dev/term:/dev/zcons:/dev/pty:/dev\fR
 .sp
 This option is ignored on systems that support either the
@@ -287,7 +288,7 @@ This is used to implement the
 functionality on systems that support
 \fRLD_PRELOAD\fR
 or its equivalent.
-The default value is:
+The default value is
 \fI@noexec_file@\fR.
 .TP 10n
 plugin_dir
@@ -295,6 +296,7 @@ The default directory to use when searching for plugins
 that are specified without a fully qualified path name.
 The default value is
 \fI@PLUGINDIR@\fR.
+.if \n(SL \{\
 .TP 10n
 sesh
 The fully-qualified path to the
@@ -305,6 +307,7 @@ This setting is only used when
 is built with SELinux support.
 The default value is
 \fI@sesh_file@\fR.
+.\}
 .SS "Other settings"
 The
 \fBsudo.conf\fR
diff --git a/doc/sudo.conf.mdoc.in b/doc/sudo.conf.mdoc.in
index fca4bceb8..534b62634 100644
--- a/doc/sudo.conf.mdoc.in
+++ b/doc/sudo.conf.mdoc.in
@@ -15,7 +15,8 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd June 20, 2019
+.nr SL @SEMAN@
+.Dd July 3, 2019
 .Dt SUDO.CONF @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -228,7 +229,7 @@ If terminal devices may be located in a sub-directory of
 .Pa /dev ,
 that path must be explicitly listed in
 .Em devsearch .
-The default value is:
+The default value is
 .Li /dev/pts:/dev/vt:/dev/term:/dev/zcons:/dev/pty:/dev
 .Pp
 This option is ignored on systems that support either the
@@ -263,13 +264,14 @@ This is used to implement the
 functionality on systems that support
 .Ev LD_PRELOAD
 or its equivalent.
-The default value is:
+The default value is
 .Pa @noexec_file@ .
 .It plugin_dir
 The default directory to use when searching for plugins
 that are specified without a fully qualified path name.
 The default value is
 .Pa @PLUGINDIR@ .
+.if \n(SL \{\
 .It sesh
 The fully-qualified path to the
 .Nm sesh
@@ -279,6 +281,7 @@ This setting is only used when
 is built with SELinux support.
 The default value is
 .Pa @sesh_file@ .
+.\}              
 .El
 .Ss Other settings
 The
-- 
2.50.1