Pass max_groups to plugin in settings list.

diff --git a/doc/sudo_plugin.cat b/doc/sudo_plugin.cat
index c00f696463515c6cc2e63077b9bbad1cbde76bbd..431ef8463043584701d16289e2247e54703509a6 100644 (file)
--- a/doc/sudo_plugin.cat
+++ b/doc/sudo_plugin.cat
@@ -149,6 +149,11 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
                        Set to true if the user specified the -\b-i\bi flag,
                        indicating that the user wishes to run a login shell.
 
+                 max_groups=int
+                       The maximum number of groups a user may belong to.
+                       This will only be present if there is a corresponding
+                       setting in sudo.conf(4).
+
                  network_addrs=list
                        A space-separated list of IP network addresses and
                        netmasks in the form ``addr/netmask'', e.g.
@@ -1363,6 +1368,8 @@ P\bPL\bLU\bUG\bGI\bIN\bN A\bAP\bPI\bI C\bCH\bHA\bAN\bNG\bGE\bEL\bLO\bOG\bG
            Support for the _\be_\bx_\be_\bc_\b__\bb_\ba_\bc_\bk_\bg_\br_\bo_\bu_\bn_\bd entry has been added to the
            command_info list.
 
+           The _\bm_\ba_\bx_\b__\bg_\br_\bo_\bu_\bp_\bs entry was added to the settings list.
+
            The s\bsu\bud\bdo\bo front end now installs default signal handlers to trap
            common signals while the plugin functions are run.
 

diff --git a/doc/sudo_plugin.man.in b/doc/sudo_plugin.man.in
index 3fe04f9164482a23626323f3e04d034005b08744..99145e244152e1a562ef2721630ca3e733bc056b 100644 (file)
--- a/doc/sudo_plugin.man.in
+++ b/doc/sudo_plugin.man.in
@@ -263,6 +263,11 @@ Set to true if the user specified the
 flag, indicating that
 the user wishes to run a login shell.
 .TP 6n
+max_groups=int
+The maximum number of groups a user may belong to.
+This will only be present if there is a corresponding setting in
+sudo.conf(@mansectform@).
+.TP 6n
 network_addrs=list
 A space-separated list of IP network addresses and netmasks in the
 form
@@ -2463,6 +2468,12 @@ entry has been added to the
 list.
 .sp
 The
+\fImax_groups\fR
+entry was added to the
+\fRsettings\fR
+list.
+.sp
+The
 \fBsudo\fR
 front end now installs default signal handlers to trap common signals
 while the plugin functions are run.

diff --git a/doc/sudo_plugin.mdoc.in b/doc/sudo_plugin.mdoc.in
index 55cb0907b1395ddfc56e3e8f5eb0f0ccbef3825f..4e655a365bdf305ceff38ab8a9e0aafa9588675b 100644 (file)
--- a/doc/sudo_plugin.mdoc.in
+++ b/doc/sudo_plugin.mdoc.in
@@ -241,6 +241,10 @@ Set to true if the user specified the
 .Fl i
 flag, indicating that
 the user wishes to run a login shell.
+.It max_groups=int
+The maximum number of groups a user may belong to.
+This will only be present if there is a corresponding setting in
+.Xr sudo.conf @mansectform@ .
 .It network_addrs=list
 A space-separated list of IP network addresses and netmasks in the
 form
@@ -2121,6 +2125,12 @@ entry has been added to the
 list.
 .Pp
 The
+.Em max_groups
+entry was added to the
+.Li settings
+list.
+.Pp
+The
 .Nm sudo
 front end now installs default signal handlers to trap common signals
 while the plugin functions are run.

diff --git a/src/parse_args.c b/src/parse_args.c
index 35e87a814916ad70c53c8e02ba9189ade07cbf00..8e04ceb850ea779a9a35dd9f0f4e604f6a07784e 100644 (file)
--- a/src/parse_args.c
+++ b/src/parse_args.c
@@ -107,7 +107,9 @@ static struct sudo_settings {
     { "closefrom" },
 #define ARG_NET_ADDRS 19
     { "network_addrs" },
-#define NUM_SETTINGS 20
+#define ARG_MAX_GROUPS 20
+    { "max_groups" },
+#define NUM_SETTINGS 21
     { NULL }
 };
 
@@ -150,6 +152,13 @@ parse_args(int argc, char **argv, int *nargc, char ***nargv, char ***settingsp,
     if (debug_flags != NULL)
        sudo_settings[ARG_DEBUG_FLAGS].value = debug_flags;
 
+    /* Set max_groups from sudo.conf. */
+    i = sudo_conf_max_groups();
+    if (i != -1) {
+       easprintf(&cp, "%d", i);
+       sudo_settings[ARG_MAX_GROUPS].value = cp;
+    }
+
     /* Returns true if the last option string was "--" */
 #define got_end_of_args        (optind > 1 && argv[optind - 1][0] == '-' && \
            argv[optind - 1][1] == '-' && argv[optind - 1][2] == '\0')