diff options
| author | Masao Uebayashi <uebayasi@cvs.openbsd.org> | 2015-10-12 16:54:31 +0000 |
|---|---|---|
| committer | Masao Uebayashi <uebayasi@cvs.openbsd.org> | 2015-10-12 16:54:31 +0000 |
| commit | b06c13ebb42a6a658b87b1b644688b9062f2fb0c (patch) | |
| tree | 2efb5a56977b31112be3e0ced327b60462e2b757 /libexec/comsat | |
| parent | 3ffaf1c2efe6794baa479bb27074abec8cf64357 (diff) | |
Call pledge(2) after initial getsockname(2) to avoid "inet" addition.
From & OK deraadt@
Diffstat (limited to 'libexec/comsat')
| -rw-r--r-- | libexec/comsat/comsat.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c index 9795b4d8063..0ba89612911 100644 --- a/libexec/comsat/comsat.c +++ b/libexec/comsat/comsat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: comsat.c,v 1.43 2015/10/10 20:35:00 deraadt Exp $ */ +/* $OpenBSD: comsat.c,v 1.44 2015/10/12 16:54:30 uebayasi Exp $ */ /* * Copyright (c) 1980, 1993 @@ -83,9 +83,6 @@ main(int argc, char *argv[]) char msgbuf[100]; sigset_t sigset; - if (pledge("stdio rpath wpath proc tty", NULL) == -1) - err(1, "pledge"); - /* verify proper invocation */ fromlen = sizeof(from); if (getsockname(0, (struct sockaddr *)&from, &fromlen) == -1) { @@ -93,6 +90,10 @@ main(int argc, char *argv[]) "comsat: getsockname: %s.\n", strerror(errno)); exit(1); } + + if (pledge("stdio rpath wpath proc tty", NULL) == -1) + err(1, "pledge"); + openlog("comsat", LOG_PID, LOG_DAEMON); if (chdir(_PATH_MAILDIR)) { syslog(LOG_ERR, "chdir: %s: %m", _PATH_MAILDIR); |