move setproctitle/privsep_process earlier

We don't always do privilege dropping (as we may start as unprivileged
user), so set these two beforehand so when we skip privdrop we don't
miss to set privsep_process and set the process' title.
This commit is contained in:
Omar Polo 2023-06-11 09:26:16 +00:00
parent 4ad573d0d5
commit 725457a9e4
1 changed files with 3 additions and 4 deletions

7
proc.c
View File

@ -548,6 +548,9 @@ proc_run(struct privsep *ps, struct privsep_proc *p,
const char *root;
log_procinit(p->p_title);
setproctitle("%s", p->p_title);
privsep_process = p->p_id;
if (ps->ps_pw == NULL)
goto init;
@ -572,10 +575,6 @@ proc_run(struct privsep *ps, struct privsep_proc *p,
if (chdir("/") == -1)
fatal("%s: chdir(\"/\")", __func__);
privsep_process = p->p_id;
setproctitle("%s", p->p_title);
if (setgroups(1, &pw->pw_gid) ||
setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) ||
setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid))