diff options
| author | Andreas Henriksson <andreas@fatal.se> | 2020-01-02 19:19:00 +0100 |
|---|---|---|
| committer | Tomáš Mráz <t8m@users.noreply.github.com> | 2020-01-10 12:21:24 +0100 |
| commit | 41e2c34bd01932fe55a32b3aa94aba5c0f9d2343 (patch) | |
| tree | 84eca40e72d128ff18035603764e529cd49e7255 | |
| parent | 527f158ec3b23b20dda19b46d000c69ed959b168 (diff) | |
| download | pam-41e2c34bd01932fe55a32b3aa94aba5c0f9d2343.tar.gz pam-41e2c34bd01932fe55a32b3aa94aba5c0f9d2343.tar.bz2 pam-41e2c34bd01932fe55a32b3aa94aba5c0f9d2343.zip | |
pam_umask: build-time usergroups option default
This change adds a configure option to set the default value of the
usergroups option (of the pam_umask module) at build-time.
Distributions usually makes the decision if usergroups should be used or
not. This allows them to control the built-in default value, without
having to ship the value in a config file (cluttering up the view
of actually relevant user/system configuration overrides).
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | modules/pam_umask/pam_umask.c | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index ab2963c1..a124b274 100644 --- a/configure.ac +++ b/configure.ac @@ -487,6 +487,17 @@ AS_IF([test "x$enable_nis" != "xno"], [ AC_SUBST([NIS_CFLAGS]) AC_SUBST([NIS_LIBS]) +AC_ARG_ENABLE([usergroups], + AS_HELP_STRING([--enable-usergroups], [sets the usergroups option default to enabled]), + [WITH_USERGROUPS=$enableval], WITH_USERGROUPS=no) +if test "$WITH_USERGROUPS" = "yes" ; then + AC_DEFINE([DEFAULT_USERGROUPS_SETTING], 1, + [Defines the value usergroups option should have by default]) +else + AC_DEFINE([DEFAULT_USERGROUPS_SETTING], 0, + [Defines the value usergroups option should have by default]) +fi + AC_ARG_ENABLE([selinux], AS_HELP_STRING([--disable-selinux],[do not use SELinux]), WITH_SELINUX=$enableval, WITH_SELINUX=yes) diff --git a/modules/pam_umask/pam_umask.c b/modules/pam_umask/pam_umask.c index d962ed1f..f101919f 100644 --- a/modules/pam_umask/pam_umask.c +++ b/modules/pam_umask/pam_umask.c @@ -90,6 +90,9 @@ get_options (pam_handle_t *pamh, options_t *options, int argc, const char **argv) { memset (options, 0, sizeof (options_t)); + + options->usergroups = DEFAULT_USERGROUPS_SETTING; + /* Parse parameters for module */ for ( ; argc-- > 0; argv++) parse_option (pamh, *argv, options); |