picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

alternative pam_setcred() fix
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-01-16 09:53:26 +01:00 committed by GitHub
parent 4bb68f2fee 46d7c6afbf
commit 251d3d20c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/execute.c
View File

@ -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];