Add COMMAND EXECUTION section that describes how sudo runs

the command, the extra sudo processes and signal handling.

--HG--
branch : 1.7

diff --git a/Makefile.in b/Makefile.in
index aa67d054d54b7f2749f1286f843d970bec45126b..30967c3a7ef70e00629eb6310b9507dbc4403c49 100644 (file)
--- 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 cfbfb930fe83e9f85393a5c08e1611a45ccfc0e5..0e2f91f5f0d8dbcc81dfc90795933c8bcc52352e 100755 (executable)
--- 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 cf730140e0d4589eb6ffe615a61bafcc5ebfda3f..ef676008ef76dfb0342ecb52365b5ed3a475355e 100755 (executable)
--- 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 e9d69232e71cd8b5b7cad557a04472f05d8f57a9..f607648e1dc6e7d7483d429be903000060bbc53a 100644 (file)
--- a/sudo.cat
+++ b/sudo.cat
@@ -384,8 +384,6 @@ C\bCO\bOM\bMM\bMA\bAN\bND\bD E\bEX\bXE\bEC\bCU\bUT\bTI\bIO\bON\bN
 
      o\bo   the environment list
 
-     o\bo   file creation mode mask (umask)
-
      o\bo   SELinux role and type
 
      o\bo   Solaris project
@@ -394,6 +392,8 @@ C\bCO\bOM\bMM\bMA\bAN\bND\bD E\bEX\bXE\bEC\bCU\bUT\bTI\bIO\bON\bN
 
      o\bo   BSD login class
 
+     o\bo   file creation mode mask (umask)
+
      See the _\bC_\bo_\bm_\bm_\ba_\bn_\bd _\bE_\bn_\bv_\bi_\br_\bo_\bn_\bm_\be_\bn_\bt section for details on how the environment
      list is constructed.
 

diff --git a/sudo.man.in b/sudo.man.in
index fd78ffde670d1be8f059007c5facd1c64029a7a0..2d8fc100267d0cc45a05afb0cd900b88e0c1f8af 100644 (file)
--- 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 235ac3fe05231d409e370c010fd514e5e5032608..0f1fe939f8961d8ab093790f67e5aa430584468a 100644 (file)
--- 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