Merge pull request #14581 from poettering/setcred-alternative-fix

alternative pam_setcred() fix
execute: allow pam_setcred() to fail, ignore errors
2025-09-20 20:34:45 +02:00 · 2020-01-16 09:53:26 +01:00 · 2020-01-15 17:10:43 +01:00 · 2020-01-15 17:10:28 +01:00
1 changed files with 3 additions and 3 deletions
--- a/src/core/execute.c
+++ b/src/core/execute.c
@ -1125,7 +1125,7 @@ static int setup_pam(
                gid_t gid,
                const char *tty,
                char ***env,
-                int fds[], size_t n_fds) {
+                const int fds[], size_t n_fds) {

 #if HAVE_PAM

@ -1195,7 +1195,7 @@ static int setup_pam(

        pam_code = pam_setcred(handle, PAM_ESTABLISH_CRED | flags);
        if (pam_code != PAM_SUCCESS)
-                goto fail;
+                log_debug("pam_setcred() failed, ignoring: %s", pam_strerror(handle, pam_code));

        pam_code = pam_open_session(handle, flags);
        if (pam_code != PAM_SUCCESS)
@ -2803,7 +2803,7 @@ static int close_remaining_fds(
                int user_lookup_fd,
                int socket_fd,
                int exec_fd,
-                int *fds, size_t n_fds) {
+                const int *fds, size_t n_fds) {

        size_t n_dont_close = 0;
        int dont_close[n_fds + 12];
Author	SHA1	Message	Date
Zbigniew Jędrzejewski-Szmek	251d3d20c3	Merge pull request #14581 from poettering/setcred-alternative-fix alternative pam_setcred() fix	2020-01-16 09:53:26 +01:00
Lennart Poettering	46d7c6afbf	execute: allow pam_setcred() to fail, ignore errors Fixes: #14567 Alternative-To: #14569	2020-01-15 17:10:43 +01:00
Lennart Poettering	5b8d1f6b77	execute: add const to array parameters, where possible	2020-01-15 17:10:28 +01:00