diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2016-10-06 23:43:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-06 23:43:08 +0300 |
| commit | 36264e0de596d9b0264ae08b53832495a78c779c (patch) | |
| tree | 658b2caae552a9a7be6810dab6b44e653a89fef9 /src/core | |
| parent | e057995bb1314a94ce460d8e5a2a20e73c0e2ad4 (diff) | |
| parent | 97f0e76f18d322d29bcfbc4ab6bb9cd67a1cdd54 (diff) | |
Merge pull request #4299 from poettering/variety
ioctl socket fixes, sd-bus error updates, resolved error addition, PAM stub process priv fix
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/execute.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/core/execute.c b/src/core/execute.c index 019ff8490b..d5c4e60796 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -781,9 +781,10 @@ static int enforce_groups(const ExecContext *context, const char *username, gid_ k++; } - if (maybe_setgroups(k, gids) < 0) { + r = maybe_setgroups(k, gids); + if (r < 0) { free(gids); - return -errno; + return r; } free(gids); @@ -843,6 +844,7 @@ static int setup_pam( const char *name, const char *user, uid_t uid, + gid_t gid, const char *tty, char ***env, int fds[], unsigned n_fds) { @@ -948,8 +950,14 @@ static int setup_pam( * and this will make PR_SET_PDEATHSIG work in most cases. * If this fails, ignore the error - but expect sd-pam threads * to fail to exit normally */ + + r = maybe_setgroups(0, NULL); + if (r < 0) + log_warning_errno(r, "Failed to setgroups() in sd-pam: %m"); + if (setresgid(gid, gid, gid) < 0) + log_warning_errno(errno, "Failed to setresgid() in sd-pam: %m"); if (setresuid(uid, uid, uid) < 0) - log_error_errno(r, "Error: Failed to setresuid() in sd-pam: %m"); + log_warning_errno(errno, "Failed to setresuid() in sd-pam: %m"); (void) ignore_signals(SIGPIPE, -1); @@ -2413,7 +2421,7 @@ static int exec_child( } if (context->pam_name && username) { - r = setup_pam(context->pam_name, username, uid, context->tty_path, &accum_env, fds, n_fds); + r = setup_pam(context->pam_name, username, uid, gid, context->tty_path, &accum_env, fds, n_fds); if (r < 0) { *exit_status = EXIT_PAM; return r; |