Add support for "cvtsudoers -d all"

diff --git a/doc/cvtsudoers.cat b/doc/cvtsudoers.cat
index 14ce460dc3523c8d1dd67976f5b1a4d81394339a..e5d05153dd866d6533a0fe5072cd999230086c41 100644 (file)
--- a/doc/cvtsudoers.cat
+++ b/doc/cvtsudoers.cat
@@ -38,7 +38,10 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
                  more Defaults types may be specified, separated by a comma
                  (`,').  The supported types are:
 
-                 global    Defaults entries that always match.
+                 all       All Defaults entries.
+
+                 global    Gobal Defaults entries that are applied regardless
+                           of user, runas, host or command.
 
                  user      Per-user Defaults entries.
 
@@ -46,7 +49,7 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
 
                  host      Per-host Defaults entries.
 
-                 commands  Per-command Defaults entries.
+                 command   Per-command Defaults entries.
 
                  See the D\bDe\bef\bfa\bau\bul\blt\bts\bs section in sudoers(4) for more information.
 

diff --git a/doc/cvtsudoers.man.in b/doc/cvtsudoers.man.in
index 360d95ed5168674a27c10c12e4364200059bc9c7..a1ce4171d3012204f4713c29b5f947d663f3cdd6 100644 (file)
--- a/doc/cvtsudoers.man.in
+++ b/doc/cvtsudoers.man.in
@@ -87,10 +87,14 @@ The supported types are:
 .RS 12n
 .PD 0
 .TP 10n
-global
-Defaults entries that always match.
+all
+All Defaults entries.
 .PD
 .TP 10n
+global
+Gobal Defaults entries that are applied regardless of
+user, runas, host or command.
+.TP 10n
 user
 Per-user Defaults entries.
 .TP 10n
@@ -100,7 +104,7 @@ Per-runas user Defaults entries.
 host
 Per-host Defaults entries.
 .TP 10n
-commands
+command
 Per-command Defaults entries.
 .PP
 See the

diff --git a/doc/cvtsudoers.mdoc.in b/doc/cvtsudoers.mdoc.in
index c3571234ebf50c4d32577abedd26075d192a91c9..da3b21c2c548281278ca7f5881fe40384bee1844 100644 (file)
--- a/doc/cvtsudoers.mdoc.in
+++ b/doc/cvtsudoers.mdoc.in
@@ -79,15 +79,18 @@ types may be specified, separated by a comma
 .Pq Ql \&, .
 The supported types are:
 .Bl -tag -width 8n
+.It all
+All Defaults entries.
 .It global
-Defaults entries that always match.
+Gobal Defaults entries that are applied regardless of
+user, runas, host or command.
 .It user
 Per-user Defaults entries.
 .It runas
 Per-runas user Defaults entries.
 .It host
 Per-host Defaults entries.
-.It commands
+.It command
 Per-command Defaults entries.
 .El
 .Pp

diff --git a/plugins/sudoers/cvtsudoers.c b/plugins/sudoers/cvtsudoers.c
index 208c1ce51503de92df89749ea7854ec68aa58f1d..e890a6cae65142d151bcca861e3b74fb11556ced 100644 (file)
--- a/plugins/sudoers/cvtsudoers.c
+++ b/plugins/sudoers/cvtsudoers.c
@@ -466,7 +466,9 @@ cvtsudoers_parse_defaults(char *expression)
     debug_decl(cvtsudoers_parse_defaults, SUDOERS_DEBUG_UTIL)
 
     for ((cp = strtok_r(cp, ",", &last)); cp != NULL; (cp = strtok_r(NULL, ",", &last))) {
-       if (strcasecmp(cp, "global") == 0) {
+       if (strcasecmp(cp, "all") == 0) {
+           SET(flags, CVT_DEFAULTS_ALL);
+       } else if (strcasecmp(cp, "global") == 0) {
            SET(flags, CVT_DEFAULTS_GLOBAL);
        } else if (strcasecmp(cp, "user") == 0) {
            SET(flags, CVT_DEFAULTS_USER);