diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/pam_access/pam_access.8.xml | 2 | ||||
-rw-r--r-- | modules/pam_access/pam_access.c | 29 | ||||
-rw-r--r-- | modules/pam_succeed_if/pam_succeed_if.8.xml | 3 | ||||
-rw-r--r-- | modules/pam_succeed_if/pam_succeed_if.c | 28 |
4 files changed, 52 insertions, 10 deletions
diff --git a/modules/pam_access/pam_access.8.xml b/modules/pam_access/pam_access.8.xml index a7a28d4a..74e39993 100644 --- a/modules/pam_access/pam_access.8.xml +++ b/modules/pam_access/pam_access.8.xml @@ -129,7 +129,7 @@ <refsect1 id="pam_access-services"> <title>MODULE SERVICES PROVIDED</title> <para> - The <option>auth</option> and <option>account</option> services are supported. + All services are supported. </para> </refsect1> diff --git a/modules/pam_access/pam_access.c b/modules/pam_access/pam_access.c index ffb3c353..80d94cc9 100644 --- a/modules/pam_access/pam_access.c +++ b/modules/pam_access/pam_access.c @@ -55,6 +55,8 @@ #define PAM_SM_AUTH #define PAM_SM_ACCOUNT +#define PAM_SM_SESSION +#define PAM_SM_PASSWORD #include <security/_pam_macros.h> #include <security/pam_modules.h> @@ -811,6 +813,27 @@ pam_sm_acct_mgmt (pam_handle_t *pamh, int flags, return pam_sm_authenticate (pamh, flags, argc, argv); } +PAM_EXTERN int +pam_sm_open_session(pam_handle_t *pamh, int flags, + int argc, const char **argv) +{ + return pam_sm_authenticate(pamh, flags, argc, argv); +} + +PAM_EXTERN int +pam_sm_close_session(pam_handle_t *pamh, int flags, + int argc, const char **argv) +{ + return pam_sm_authenticate(pamh, flags, argc, argv); +} + +PAM_EXTERN int +pam_sm_chauthtok(pam_handle_t *pamh, int flags, + int argc, const char **argv) +{ + return pam_sm_authenticate(pamh, flags, argc, argv); +} + /* end of module definition */ #ifdef PAM_STATIC @@ -822,8 +845,8 @@ struct pam_module _pam_access_modstruct = { pam_sm_authenticate, pam_sm_setcred, pam_sm_acct_mgmt, - NULL, - NULL, - NULL + pam_sm_open_session, + pam_sm_close_session, + pam_sm_chauthtok }; #endif diff --git a/modules/pam_succeed_if/pam_succeed_if.8.xml b/modules/pam_succeed_if/pam_succeed_if.8.xml index 1b57a652..b7ad29e6 100644 --- a/modules/pam_succeed_if/pam_succeed_if.8.xml +++ b/modules/pam_succeed_if/pam_succeed_if.8.xml @@ -218,8 +218,7 @@ <refsect1 id="pam_succeed_if-services"> <title>MODULE SERVICES PROVIDED</title> <para> - The <emphasis remap='B'>auth</emphasis> and - <emphasis remap='B'>account</emphasis> services are supported. + All services are supported. </para> </refsect1> diff --git a/modules/pam_succeed_if/pam_succeed_if.c b/modules/pam_succeed_if/pam_succeed_if.c index 51510de8..4f33ba2e 100644 --- a/modules/pam_succeed_if/pam_succeed_if.c +++ b/modules/pam_succeed_if/pam_succeed_if.c @@ -56,6 +56,8 @@ #define PAM_SM_AUTH #define PAM_SM_ACCOUNT +#define PAM_SM_SESSION +#define PAM_SM_PASSWORD #include <security/pam_modules.h> #include <security/pam_modutil.h> @@ -503,7 +505,7 @@ PAM_EXTERN int pam_sm_setcred(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { - return PAM_SUCCESS; + return PAM_IGNORE; } PAM_EXTERN int @@ -512,6 +514,24 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, const char **argv) return pam_sm_authenticate(pamh, flags, argc, argv); } +PAM_EXTERN int +pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +{ + return pam_sm_authenticate(pamh, flags, argc, argv); +} + +PAM_EXTERN int +pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +{ + return pam_sm_authenticate(pamh, flags, argc, argv); +} + +PAM_EXTERN int +pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) +{ + return pam_sm_authenticate(pamh, flags, argc, argv); +} + /* static module data */ #ifdef PAM_STATIC struct pam_module _pam_succeed_if_modstruct = { @@ -519,8 +539,8 @@ struct pam_module _pam_succeed_if_modstruct = { pam_sm_authenticate, pam_sm_setcred, pam_sm_acct_mgmt, - NULL, - NULL, - NULL + pam_sm_open_session, + pam_sm_close_session, + pam_sm_chauthtok }; #endif |