diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2012-02-03 00:13:44 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2012-02-03 00:13:44 +0000 |
| commit | 3c69856acf9af74368b789b1ed867b433db0ed02 (patch) | |
| tree | beb903eaa0c4ea459ecfa833c9ed2fa469e88e40 /libpam | |
| parent | fa1cf8afa8d482753900a1ac8a171b977bf40e15 (diff) | |
| download | pam-3c69856acf9af74368b789b1ed867b433db0ed02.tar.gz pam-3c69856acf9af74368b789b1ed867b433db0ed02.tar.bz2 pam-3c69856acf9af74368b789b1ed867b433db0ed02.zip | |
pam_unix: make configuration consistent in --enable-static-modules mode
In --enable-static-modules mode, it was not possible to use "pam_unix"
in PAM config files. Instead, different names had to be used for each
management group: pam_unix_auth, pam_unix_acct, pam_unix_passwd and
pam_unix_session. This change makes pam_unix configuration consistent
with other PAM modules.
* README: Remove the paragraph describing pam_unix distinctions in
--enable-static-modules mode.
* libpam/pam_static_modules.h (_pam_unix_acct_modstruct,
_pam_unix_auth_modstruct, _pam_unix_passwd_modstruct,
_pam_unix_session_modstruct): Remove.
(_pam_unix_modstruct): New pam_module declaration.
* modules/pam_unix/pam_unix_static.h: New file.
* modules/pam_unix/pam_unix_static.c: Likewise.
* modules/pam_unix/Makefile.am (noinst_HEADERS): Add pam_unix_static.h
(pam_unix_la_SOURCES) [STATIC_MODULES]: Add pam_unix_static.c
* modules/pam_unix/pam_unix_acct.c [PAM_STATIC]: Include
pam_unix_static.h
[PAM_STATIC] (_pam_unix_acct_modstruct): Remove.
* modules/pam_unix/pam_unix_auth.c [PAM_STATIC]: Include
pam_unix_static.h
[PAM_STATIC] (_pam_unix_auth_modstruct): Remove.
* modules/pam_unix/pam_unix_passwd.c [PAM_STATIC]: Include
pam_unix_static.h
[PAM_STATIC] (_pam_unix_passwd_modstruct): Remove.
* modules/pam_unix/pam_unix_sess.c [PAM_STATIC]: Include
pam_unix_static.h
[PAM_STATIC] (_pam_unix_session_modstruct): Remove.
Suggested-by: Matveychikov Ilya <i.matveychikov@securitycode.ru>
Diffstat (limited to 'libpam')
| -rw-r--r-- | libpam/pam_static_modules.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libpam/pam_static_modules.h b/libpam/pam_static_modules.h index b1739ed1..698989bd 100644 --- a/libpam/pam_static_modules.h +++ b/libpam/pam_static_modules.h @@ -80,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; @@ -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, |