From 1afcebd4ebf73107535b9bb1d2c1b958e261c217 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Tue, 21 Aug 2012 13:01:46 -0400
Subject: [PATCH] Add COMMAND EXECUTION section that describes how sudo runs
 the command, the extra sudo processes and signal handling.

--HG--
branch : 1.7
---
 Makefile.in  |  4 ++--
 fixman.sh    | 25 +++++++++++++++++++++++++
 fixmdoc.sh   | 20 ++++++++++++++++++++
 sudo.cat     |  4 ++--
 sudo.man.in  |  6 +++---
 sudo.mdoc.in |  4 ++--
 6 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index aa67d054d..30967c3a7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -529,13 +529,13 @@ $(srcdir)/sudo.man.in: $(srcdir)/sudo.mdoc.in
 	fi
 
 sudo.man.sed: $(srcdir)/fixman.sh
-	BAMAN=@BAMAN@ LCMAN=@LCMAN@ SEMAN=@SEMAN@ $(SHELL) $(srcdir)/fixman.sh $@
+	BAMAN=@BAMAN@ LCMAN=@LCMAN@ SEMAN=@SEMAN@ PSMAN=@PSMAN@ $(SHELL) $(srcdir)/fixman.sh $@
 
 sudo.man: $(srcdir)/sudo.man.in sudo.man.sed
 	(cd $(top_builddir) && $(SHELL) config.status --file=-) < $(srcdir)/$@.in | $(SED) -f $@.sed > $@
 
 sudo.mdoc.sed: $(srcdir)/fixmdoc.sh
-	BAMAN=@BAMAN@ LCMAN=@LCMAN@ SEMAN=@SEMAN@ $(SHELL) $(srcdir)/fixmdoc.sh $@
+	BAMAN=@BAMAN@ LCMAN=@LCMAN@ SEMAN=@SEMAN@ PSMAN=@PSMAN@ $(SHELL) $(srcdir)/fixmdoc.sh $@
 
 sudo.mdoc: $(srcdir)/sudo.mdoc.in sudo.mdoc.sed
 	(cd $(top_builddir) && $(SHELL) config.status --file=-) < $(srcdir)/$@.in | $(SED) -f $@.sed > $@
diff --git a/fixman.sh b/fixman.sh
index cfbfb930f..0e2f91f5f 100755
--- a/fixman.sh
+++ b/fixman.sh
@@ -42,6 +42,12 @@ case "$OUTFILE" in
 		/^\\fB\\-c\\fR \\fIclass\\fR$/,/^\.TP 12n$/ {
 			/^\.PD$/!d
 		}
+		/^login_cap(3),$/d
+		/^BSD login class$/ {
+			N
+			N
+			/^BSD login class\n\.TP 4n\n\\fBo\\fR$/d
+		}
 	EOF
 	fi
 
@@ -52,6 +58,25 @@ case "$OUTFILE" in
 		/^\\fB\\-[rt]\\fR \\fI[rt][oy][lp]e\\fR$/,/^\.TP 12n$/ {
 			/^\.PD$/!d
 		}
+		/^SELinux role and type$/ {
+			N
+			N
+			/^SELinux role and type\n\.TP 4n\n\\fBo\\fR$/d
+		}
+	EOF
+	fi
+
+	# Solaris privileges
+	if [ X"$PSMAN" != X"1" ]; then
+	cat >>"$OUTFILE" <<-'EOF'
+		/^Solaris project$/ {
+			N
+			N
+			N
+			N
+			N
+			/^Solaris project\n\.TP 4n\n\\fBo\\fR\nSolaris privileges\n\.TP 4n\n\\fBo\\fR$/d
+		}
 	EOF
 	fi
 		;;
diff --git a/fixmdoc.sh b/fixmdoc.sh
index cf730140e..ef676008e 100755
--- a/fixmdoc.sh
+++ b/fixmdoc.sh
@@ -35,6 +35,10 @@ case "$OUTFILE" in
 				d
 			}
 			/^\.Xr login_cap 3 ,$/d
+			/^BSD login class$/ {
+				N
+				/^BSD login class\n\.It$/d
+			}
 		EOF
 	fi
 
@@ -49,6 +53,22 @@ case "$OUTFILE" in
 			/^\.It Fl t Ar type/,/specified role\.$/ {
 				d
 			}
+			/^SELinux role and type$/ {
+				N
+				/^SELinux role and type\n\.It$/d
+			}
+		EOF
+	fi
+
+	# Solaris privileges
+	if [ X"$PSMAN" != X"1" ]; then
+		cat >>"$OUTFILE" <<-'EOF'
+			/^Solaris project$/ {
+				N
+				N
+				N
+				/^Solaris project\n\.It\nSolaris privileges\n\.It$/d
+			}
 		EOF
 	fi
 
diff --git a/sudo.cat b/sudo.cat
index e9d69232e..f607648e1 100644
--- a/sudo.cat
+++ b/sudo.cat
@@ -384,8 +384,6 @@ CCOOMMMMAANNDD EEXXEECCUUTTIIOONN
 
      oo   the environment list
 
-     oo   file creation mode mask (umask)
-
      oo   SELinux role and type
 
      oo   Solaris project
@@ -394,6 +392,8 @@ CCOOMMMMAANNDD EEXXEECCUUTTIIOONN
 
      oo   BSD login class
 
+     oo   file creation mode mask (umask)
+
      See the _C_o_m_m_a_n_d _E_n_v_i_r_o_n_m_e_n_t section for details on how the environment
      list is constructed.
 
diff --git a/sudo.man.in b/sudo.man.in
index fd78ffde6..2d8fc1002 100644
--- a/sudo.man.in
+++ b/sudo.man.in
@@ -949,9 +949,6 @@ supplementary group IDs
 the environment list
 .TP 4n
 \fBo\fR
-file creation mode mask (umask)
-.TP 4n
-\fBo\fR
 SELinux role and type
 .TP 4n
 \fBo\fR
@@ -962,6 +959,9 @@ Solaris privileges
 .TP 4n
 \fBo\fR
 BSD login class
+.TP 4n
+\fBo\fR
+file creation mode mask (umask)
 .PP
 See the
 \fICommand Environment\fR
diff --git a/sudo.mdoc.in b/sudo.mdoc.in
index 235ac3fe0..0f1fe939f 100644
--- a/sudo.mdoc.in
+++ b/sudo.mdoc.in
@@ -946,8 +946,6 @@ supplementary group IDs
 .It
 the environment list
 .It
-file creation mode mask (umask)
-.It
 SELinux role and type
 .It
 Solaris project
@@ -955,6 +953,8 @@ Solaris project
 Solaris privileges
 .It
 BSD login class
+.It
+file creation mode mask (umask)
 .El
 .Pp
 See the
-- 
2.40.0