mirrors
/
kore
mirror of https://git.kore.io/kore.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

call fatalx() instead of fatal() in certain cases.

This commit is contained in:
Joris Vink 2018-08-13 13:01:27 +02:00
parent b0074ba45e
commit 8d3f73bc71
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/worker.c
View File

@ -227,30 +227,30 @@ kore_worker_privdrop(const char *runas, const char *root)
struct passwd *pw = NULL;
if (root == NULL)
fatal("no root directory for kore_worker_privdrop");
fatalx("no root directory for kore_worker_privdrop");
/* Must happen before chroot. */
if (skip_runas == 0) {
if (runas == NULL)
fatal("no runas user given and -r not specified");
fatalx("no runas user given and -r not specified");
pw = getpwnam(runas);
if (pw == NULL) {
fatal("cannot getpwnam(\"%s\") for user: %s",
fatalx("cannot getpwnam(\"%s\") for user: %s",
runas, errno_s);
}
}
if (skip_chroot == 0) {
if (chroot(root) == -1) {
fatal("cannot chroot(\"%s\"): %s",
fatalx("cannot chroot(\"%s\"): %s",
root, errno_s);
}
if (chdir("/") == -1)
fatal("cannot chdir(\"/\"): %s", errno_s);
fatalx("cannot chdir(\"/\"): %s", errno_s);
} else {
if (chdir(root) == -1)
fatal("cannot chdir(\"%s\"): %s", root, errno_s);
fatalx("cannot chdir(\"%s\"): %s", root, errno_s);
}
if (getrlimit(RLIMIT_NOFILE, &rl) == -1) {
@ -279,7 +279,7 @@ kore_worker_privdrop(const char *runas, const char *root)
setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) ||
setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid))
#endif
fatal("cannot drop privileges");
fatalx("cannot drop privileges");
}
#if defined(KORE_USE_PLATFORM_PLEDGE)
@ -322,6 +322,8 @@ kore_worker_entry(struct kore_worker *kw)
exit(0);
}
#endif
kore_platform_event_init();
kore_msg_worker_init();
kore_worker_privdrop(kore_runas_user, kore_root_path);
@ -343,9 +345,6 @@ kore_worker_entry(struct kore_worker *kw)
next_prune = 0;
worker_active_connections = 0;
kore_platform_event_init();
kore_msg_worker_init();
#if defined(KORE_USE_PGSQL)
kore_pgsql_sys_init();
#endif