61 lines
1.7 KiB
Diff
61 lines
1.7 KiB
Diff
diff --git a/src/mod_pam_env.c b/src/mod_pam_env.c
|
|
index b280789..2d04391 100644
|
|
--- a/src/mod_pam_env.c
|
|
+++ b/src/mod_pam_env.c
|
|
@@ -38,9 +38,6 @@ write_config_env (pam_module_t * this, enum write_type op, FILE * fp)
|
|
|
|
switch (op)
|
|
{
|
|
- case AUTH:
|
|
- fprintf (fp, "auth\trequired\tpam_env.so\t");
|
|
- break;
|
|
case SESSION:
|
|
fprintf (fp, "session\toptional\tpam_env.so\t");
|
|
break;
|
|
diff --git a/src/pam-config.c b/src/pam-config.c
|
|
index 29b34ef..0d97b5a 100644
|
|
--- a/src/pam-config.c
|
|
+++ b/src/pam-config.c
|
|
@@ -1059,8 +1059,6 @@ main (int argc, char *argv[])
|
|
if (sanitize_check_account (common_module_list, 0) != 0)
|
|
return 1;
|
|
|
|
- opt_set = mod_pam_unix.get_opt_set (&mod_pam_env, AUTH);
|
|
- opt_set->enable (opt_set, "is_enabled", TRUE);
|
|
opt_set = mod_pam_unix.get_opt_set (&mod_pam_unix, AUTH);
|
|
opt_set->enable (opt_set, "is_enabled", TRUE);
|
|
if (sanitize_check_auth (common_module_list, 0) != 0)
|
|
diff --git a/src/supported-modules.h b/src/supported-modules.h
|
|
index 5067db8..bf7b4ba 100644
|
|
--- a/src/supported-modules.h
|
|
+++ b/src/supported-modules.h
|
|
@@ -121,7 +121,6 @@ static pam_module_t *module_list_account[] = {
|
|
};
|
|
|
|
static pam_module_t *module_list_auth[] = {
|
|
- &mod_pam_env,
|
|
&mod_pam_faildelay,
|
|
&mod_pam_group,
|
|
&mod_pam_pkcs11,
|
|
@@ -195,10 +194,10 @@ static pam_module_t *module_list_session[] = {
|
|
&mod_pam_exec,
|
|
&mod_pam_ecryptfs,
|
|
&mod_pam_fscrypt,
|
|
- &mod_pam_env,
|
|
&mod_pam_mktemp,
|
|
&mod_pam_himmelblau,
|
|
&mod_pam_kanidm,
|
|
+ &mod_pam_env,
|
|
NULL
|
|
};
|
|
|
|
@@ -224,8 +223,8 @@ static pam_module_t *module_list_session_nl[] = {
|
|
&mod_pam_exec,
|
|
&mod_pam_ecryptfs,
|
|
&mod_pam_fscrypt,
|
|
- &mod_pam_env,
|
|
&mod_pam_mktemp,
|
|
+ &mod_pam_env,
|
|
NULL
|
|
};
|