Make -c option description more accurate (merged from sudo 1.8).

--HG--
branch : 1.7

diff --git a/sudo.cat b/sudo.cat
index 7d7ad7ef1514f1638b9588a5a09c94e056f9b711..ee9c075a42011ba59f8c42f3d3fc7928744f8132 100644 (file)
--- a/sudo.cat
+++ b/sudo.cat
@@ -64,15 +64,16 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
                  only available when the administrator has enabled the
                  _\bc_\bl_\bo_\bs_\be_\bf_\br_\bo_\bm_\b__\bo_\bv_\be_\br_\br_\bi_\bd_\be option in sudoers(4).
 
-     -\b-c\bc _\bc_\bl_\ba_\bs_\bs    The -\b-c\bc (_\bc_\bl_\ba_\bs_\bs) option causes s\bsu\bud\bdo\bo to run the specified
-                 command with resources limited by the specified login class.
-                 The _\bc_\bl_\ba_\bs_\bs argument can be either a class name as defined in
-                 _\b/_\be_\bt_\bc_\b/_\bl_\bo_\bg_\bi_\bn_\b._\bc_\bo_\bn_\bf, or a single `-' character.  Specifying a
-                 _\bc_\bl_\ba_\bs_\bs of - indicates that the command should be run
-                 restricted by the default login capabilities for the user the
-                 command is run as.  If the _\bc_\bl_\ba_\bs_\bs argument specifies an
-                 existing user class, the command must be run as root, or the
-                 s\bsu\bud\bdo\bo command must be run from a shell that is already root.
+     -\b-c\bc _\bc_\bl_\ba_\bs_\bs    The -\b-c\bc (_\bc_\bl_\ba_\bs_\bs) option causes s\bsu\bud\bdo\bo to run the command with
+                 resource limits and scheduling priority of the specified
+                 login _\bc_\bl_\ba_\bs_\bs.  The _\bc_\bl_\ba_\bs_\bs argument can be either a class name
+                 as defined in _\b/_\be_\bt_\bc_\b/_\bl_\bo_\bg_\bi_\bn_\b._\bc_\bo_\bn_\bf, or a single `-' character.  If
+                 _\bc_\bl_\ba_\bs_\bs is -, the default login class of the target user will
+                 be used.  Otherwise, the command must be run as the superuser
+                 (user ID 0), or s\bsu\bud\bdo\bo must be run from a shell that is already
+                 running as the superuser.  If the command is being run as a
+                 login shell, additional _\b/_\be_\bt_\bc_\b/_\bl_\bo_\bg_\bi_\bn_\b._\bc_\bo_\bn_\bf settings, such as the
+                 umask and environment variables, will be applied, if present.
                  This option is only available on systems with BSD login
                  classes.
 
@@ -815,4 +816,4 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
      file distributed with s\bsu\bud\bdo\bo or http://www.sudo.ws/sudo/license.html for
      complete details.
 
-Sudo 1.7.10                      July 10, 2012                     Sudo 1.7.10
+Sudo 1.7.10                    December 8, 2013                    Sudo 1.7.10

diff --git a/sudo.man.in b/sudo.man.in
index ee41822c8dc57d2901e457740c782afc11941fa0..43f52ba029c6d83cc42e4d1c9dfe7da1848a06c0 100644 (file)
--- a/sudo.man.in
+++ b/sudo.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 "SUDO" "@mansectsu@" "July 10, 2012" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
+.TH "SUDO" "@mansectsu@" "December 8, 2013" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -184,8 +184,9 @@ The
 \fB\-c\fR (\fIclass\fR)
 option causes
 \fBsudo\fR
-to run the specified command with resources limited by the specified
-login class.
+to run the command with resource limits and scheduling priority of
+the specified login
+\fIclass\fR.
 The
 \fIclass\fR
 argument can be either a class name as defined in
@@ -193,18 +194,18 @@ argument can be either a class name as defined in
 or a single
 `\-'
 character.
-Specifying a
-\fIclass\fR
-of
-\fR-\fR
-indicates that the command should be run restricted by the default
-login capabilities for the user the command is run as.
-If the
+If
 \fIclass\fR
-argument specifies an existing user class, the command must be run
-as root, or the
+is
+\fR-\fR,
+the default login class of the target user will be used.
+Otherwise, the command must be run as the superuser (user ID 0), or
 \fBsudo\fR
-command must be run from a shell that is already root.
+must be run from a shell that is already running as the superuser.
+If the command is being run as a login shell, additional
+\fI/etc/login.conf\fR
+settings, such as the umask and environment variables, will
+be applied, if present.
 This option is only available on systems with BSD login classes.
 .TP 12n
 \fB\-E\fR

diff --git a/sudo.mdoc.in b/sudo.mdoc.in
index 325040a10cb9f24147029d3f7b0f36bd68bb25b9..11ee8e06cd35d80276fe5b09e663444f4f6b2412 100644 (file)
--- a/sudo.mdoc.in
+++ b/sudo.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 July 10, 2012
+.Dd December 8, 2013
 .Dt SUDO @mansectsu@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -220,8 +220,9 @@ The
 .Fl c No ( Em class Ns No )
 option causes
 .Nm sudo
-to run the specified command with resources limited by the specified
-login class.
+to run the command with resource limits and scheduling priority of
+the specified login
+.Ar class .
 The
 .Em class
 argument can be either a class name as defined in
@@ -229,18 +230,18 @@ argument can be either a class name as defined in
 or a single
 .Ql \-
 character.
-Specifying a
-.Ar class
-of
-.Li -
-indicates that the command should be run restricted by the default
-login capabilities for the user the command is run as.
-If the
+If
 .Ar class
-argument specifies an existing user class, the command must be run
-as root, or the
+is
+.Li - ,
+the default login class of the target user will be used.
+Otherwise, the command must be run as the superuser (user ID 0), or
 .Nm sudo
-command must be run from a shell that is already root.
+must be run from a shell that is already running as the superuser.
+If the command is being run as a login shell, additional
+.Pa /etc/login.conf
+settings, such as the umask and environment variables, will
+be applied, if present.
 This option is only available on systems with BSD login classes.
 .It Fl E
 The