summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2012-12-15 23:19:36 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2012-12-15 23:19:36 +0000
commit51cece4c7babb0f96d9e840fe3ee11e378dff206 (patch)
tree1550f0111e7bdfa16a8d1cac585cc9a6f589a9cb /sbin
parent0b5d7b7b5f6132e9984f1acae9923c080ed15383 (diff)
Don't print an error if the process exited normally.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/iked/iked.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/sbin/iked/iked.c b/sbin/iked/iked.c
index f2e0942b0dd..bb18e88815c 100644
--- a/sbin/iked/iked.c
+++ b/sbin/iked/iked.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iked.c,v 1.14 2012/11/29 15:08:08 reyk Exp $ */
+/* $OpenBSD: iked.c,v 1.15 2012/12/15 23:19:35 reyk Exp $ */
/* $vantronix: iked.c,v 1.22 2010/06/02 14:43:30 reyk Exp $ */
/*
@@ -120,9 +120,6 @@ main(int argc, char *argv[])
}
}
- argv += optind;
- argc -= optind;
-
if ((env = calloc(1, sizeof(*env))) == NULL)
fatal("calloc: env");
@@ -314,8 +311,9 @@ parent_sig_handler(int sig, short event, void *arg)
for (id = 0; id < PROC_MAX; id++)
if (pid == ps->ps_pid[id]) {
- log_warnx("lost child: %s %s",
- ps->ps_title[id], cause);
+ if (fail)
+ log_warnx("lost child: %s %s",
+ ps->ps_title[id], cause);
break;
}