From 5b8d1f6b7757781eb55ac15a1e079dcb7bc6792a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 15 Jan 2020 17:08:25 +0100 Subject: [PATCH 1/2] execute: add const to array parameters, where possible --- src/core/execute.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/execute.c b/src/core/execute.c index 2a02cc54db..ad5e25e223 100644 --- 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 @@ -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]; From 46d7c6afbf92e74fb96b6df2858d858ec77db991 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 15 Jan 2020 17:09:36 +0100 Subject: [PATCH 2/2] execute: allow pam_setcred() to fail, ignore errors Fixes: #14567 Alternative-To: #14569 --- src/core/execute.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/execute.c b/src/core/execute.c index ad5e25e223..f3d2005637 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -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)