summaryrefslogtreecommitdiffstats
path: root/usr.sbin/switchd/proc.c
diff options
context:
space:
mode:
authorbenno <benno@openbsd.org>2017-05-29 12:56:26 +0000
committerbenno <benno@openbsd.org>2017-05-29 12:56:26 +0000
commit566d2cada7e05d1327c537c9bcdb228a6fa64481 (patch)
tree265a6ee4f0986bd840754da7c688cdb2d0f2c2c2 /usr.sbin/switchd/proc.c
parentdo not whine if installpath is undef. (diff)
downloadwireguard-openbsd-566d2cada7e05d1327c537c9bcdb228a6fa64481.tar.xz
wireguard-openbsd-566d2cada7e05d1327c537c9bcdb228a6fa64481.zip
sync proc.c changes from relayd/httpd
Diffstat (limited to 'usr.sbin/switchd/proc.c')
-rw-r--r--usr.sbin/switchd/proc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/switchd/proc.c b/usr.sbin/switchd/proc.c
index 55ed09e4275..94ee34bfe9f 100644
--- a/usr.sbin/switchd/proc.c
+++ b/usr.sbin/switchd/proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.c,v 1.11 2017/01/17 22:10:56 krw Exp $ */
+/* $OpenBSD: proc.c,v 1.12 2017/05/29 12:56:26 benno Exp $ */
/*
* Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -505,7 +505,7 @@ proc_sig_handler(int sig, short event, void *arg)
/* ignore */
break;
default:
- fatalx("proc_sig_handler: unexpected signal");
+ fatalx("%s: unexpected signal", __func__);
/* NOTREACHED */
}
}
@@ -545,9 +545,9 @@ proc_run(struct privsep *ps, struct privsep_proc *p,
root = pw->pw_dir;
if (chroot(root) == -1)
- fatal("proc_run: chroot");
+ fatal("%s: chroot", __func__);
if (chdir("/") == -1)
- fatal("proc_run: chdir(\"/\")");
+ fatal("%s: chdir(\"/\")", __func__);
privsep_process = p->p_id;
@@ -556,7 +556,7 @@ proc_run(struct privsep *ps, struct privsep_proc *p,
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))
- fatal("proc_run: cannot drop privileges");
+ fatal("%s: cannot drop privileges", __func__);
event_init();