diff options
| author | Steve Langasek <vorlon@debian.org> | 2019-01-22 15:01:39 -0800 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-01-22 15:02:03 -0800 |
| commit | 5cd7bb4511a7c2b355a615f19a9eca193320aa3e (patch) | |
| tree | ceb3e40947d1f0f4712f473e410494177d5763e0 /modules/pam_rootok/pam_rootok.c | |
| parent | cfa575497a113d8da1a2c79ef028b5c9648dc136 (diff) | |
| parent | f00afb1ef201b2eef7f9ddbe5a0c6ca802cf49bb (diff) | |
| download | pam-5cd7bb4511a7c2b355a615f19a9eca193320aa3e.tar.gz pam-5cd7bb4511a7c2b355a615f19a9eca193320aa3e.tar.bz2 pam-5cd7bb4511a7c2b355a615f19a9eca193320aa3e.zip | |
Merge upstream version 1.3.0
Diffstat (limited to 'modules/pam_rootok/pam_rootok.c')
| -rw-r--r-- | modules/pam_rootok/pam_rootok.c | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/modules/pam_rootok/pam_rootok.c b/modules/pam_rootok/pam_rootok.c index 70579e5b..17baabe4 100644 --- a/modules/pam_rootok/pam_rootok.c +++ b/modules/pam_rootok/pam_rootok.c @@ -106,7 +106,7 @@ selinux_check_root (void) return status; } - status = selinux_check_access(user_context, user_context, "passwd", "passwd", NULL); + status = selinux_check_access(user_context, user_context, "passwd", "rootok", NULL); selinux_set_callback(SELINUX_CB_LOG, old_callback); freecon(user_context); @@ -135,7 +135,7 @@ check_for_root (pam_handle_t *pamh, int ctrl) /* --- management functions --- */ -PAM_EXTERN int +int pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -146,14 +146,14 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, return check_for_root (pamh, ctrl); } -PAM_EXTERN int +int pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_SUCCESS; } -PAM_EXTERN int +int pam_sm_acct_mgmt (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -164,7 +164,7 @@ pam_sm_acct_mgmt (pam_handle_t *pamh, int flags UNUSED, return check_for_root (pamh, ctrl); } -PAM_EXTERN int +int pam_sm_chauthtok (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -175,20 +175,4 @@ pam_sm_chauthtok (pam_handle_t *pamh, int flags UNUSED, return check_for_root (pamh, ctrl); } -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_rootok_modstruct = { - "pam_rootok", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - NULL, - NULL, - pam_sm_chauthtok, -}; - -#endif - /* end of module definition */ |