diff options
| author | Steve Langasek <steve.langasek@ubuntu.com> | 2019-01-03 21:23:37 -0800 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 22:11:51 -0800 |
| commit | 7e6c4749370338c9af7e1b959f8ab96d089786d6 (patch) | |
| tree | 2da5e702d7da7b222237ea5ac71e208dd70791a6 /libpam/pam_static_modules.h | |
| parent | fa4960114fc50965a9696f2db7406a9d792e3ff8 (diff) | |
| parent | 795badba7f95e737f979917859cd32c9bd47bcad (diff) | |
| download | pam-7e6c4749370338c9af7e1b959f8ab96d089786d6.tar.gz pam-7e6c4749370338c9af7e1b959f8ab96d089786d6.tar.bz2 pam-7e6c4749370338c9af7e1b959f8ab96d089786d6.zip | |
Merge upstream version 1.1.8
Diffstat (limited to 'libpam/pam_static_modules.h')
| -rw-r--r-- | libpam/pam_static_modules.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libpam/pam_static_modules.h b/libpam/pam_static_modules.h index 999adc2a..698989bd 100644 --- a/libpam/pam_static_modules.h +++ b/libpam/pam_static_modules.h @@ -63,7 +63,6 @@ extern struct pam_module _pam_nologin_modstruct; extern struct pam_module _pam_permit_modstruct; extern struct pam_module _pam_pwhistory_modstruct; extern struct pam_module _pam_rhosts_modstruct; -extern struct pam_module _pam_rhosts_auth_modstruct; extern struct pam_module _pam_rootok_modstruct; extern struct pam_module _pam_securetty_modstruct; #ifdef WITH_SELINUX @@ -81,10 +80,7 @@ extern struct pam_module _pam_timestamp_modstruct; extern struct pam_module _pam_tty_audit_modstruct; #endif extern struct pam_module _pam_umask_modstruct; -extern struct pam_module _pam_unix_acct_modstruct; -extern struct pam_module _pam_unix_auth_modstruct; -extern struct pam_module _pam_unix_passwd_modstruct; -extern struct pam_module _pam_unix_session_modstruct; +extern struct pam_module _pam_unix_modstruct; extern struct pam_module _pam_userdb_modstruct; extern struct pam_module _pam_warn_modstruct; extern struct pam_module _pam_wheel_modstruct; @@ -95,7 +91,9 @@ extern struct pam_module _pam_xauth_modstruct; static struct pam_module *static_modules[] = { &_pam_access_modstruct, +#ifdef HAVE_LIBCRACK &_pam_cracklib_modstruct, +#endif &_pam_debug_modstruct, &_pam_deny_modstruct, &_pam_echo_modstruct, @@ -124,7 +122,6 @@ static struct pam_module *static_modules[] = { &_pam_permit_modstruct, &_pam_pwhistory_modstruct, &_pam_rhosts_modstruct, - &_pam_rhosts_auth_modstruct, &_pam_rootok_modstruct, &_pam_securetty_modstruct, #ifdef WITH_SELINUX @@ -142,10 +139,7 @@ static struct pam_module *static_modules[] = { &_pam_tty_audit_modstruct, #endif &_pam_umask_modstruct, - &_pam_unix_acct_modstruct, - &_pam_unix_auth_modstruct, - &_pam_unix_passwd_modstruct, - &_pam_unix_session_modstruct, + &_pam_unix_modstruct, &_pam_userdb_modstruct, &_pam_warn_modstruct, &_pam_wheel_modstruct, |