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_keyinit/pam_keyinit.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_keyinit/pam_keyinit.c')
| -rw-r--r-- | modules/pam_keyinit/pam_keyinit.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/modules/pam_keyinit/pam_keyinit.c b/modules/pam_keyinit/pam_keyinit.c index 8d0501e0..b2fa5d95 100644 --- a/modules/pam_keyinit/pam_keyinit.c +++ b/modules/pam_keyinit/pam_keyinit.c @@ -165,7 +165,6 @@ static void kill_keyrings(pam_handle_t *pamh) /* * open a PAM session by making sure there's a session keyring */ -PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -218,7 +217,8 @@ int pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, if (uid != old_uid && setreuid(uid, -1) < 0) { error(pamh, "Unable to change UID to %d temporarily\n", uid); - setregid(old_gid, -1); + if (setregid(old_gid, -1) < 0) + error(pamh, "Unable to change GID back to %d\n", old_gid); return PAM_SESSION_ERR; } @@ -237,7 +237,6 @@ int pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, /* * close a PAM session by revoking the session keyring if requested */ -PAM_EXTERN int pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -251,18 +250,3 @@ int pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED, return PAM_SUCCESS; } - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_keyinit_modstruct = { - "pam_keyinit", - NULL, - NULL, - NULL, - pam_sm_open_session, - pam_sm_close_session, - NULL -}; -#endif |