diff options
author | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2009-09-03 08:19:14 +0000 |
---|---|---|
committer | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2009-09-03 08:19:14 +0000 |
commit | ec2dc3d89b8fdb08fb78b751a22d47edb67bbc0c (patch) | |
tree | f69ba678b2755c65048dacb605c5d350f96dc5f1 | |
parent | b30150e2689beead002818b89198c1503fff165e (diff) |
imsg_get sets errno so use fatal instead of fatalx.
-rw-r--r-- | usr.sbin/smtpd/control.c | 14 | ||||
-rw-r--r-- | usr.sbin/smtpd/dns.c | 6 | ||||
-rw-r--r-- | usr.sbin/smtpd/lka.c | 14 | ||||
-rw-r--r-- | usr.sbin/smtpd/mda.c | 8 | ||||
-rw-r--r-- | usr.sbin/smtpd/mfa.c | 10 | ||||
-rw-r--r-- | usr.sbin/smtpd/mta.c | 10 | ||||
-rw-r--r-- | usr.sbin/smtpd/queue.c | 14 | ||||
-rw-r--r-- | usr.sbin/smtpd/runner.c | 16 | ||||
-rw-r--r-- | usr.sbin/smtpd/smtp.c | 14 | ||||
-rw-r--r-- | usr.sbin/smtpd/smtpd.c | 16 |
10 files changed, 61 insertions, 61 deletions
diff --git a/usr.sbin/smtpd/control.c b/usr.sbin/smtpd/control.c index 9c34d0b546c..7d29196ef11 100644 --- a/usr.sbin/smtpd/control.c +++ b/usr.sbin/smtpd/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.35 2009/06/07 05:56:25 eric Exp $ */ +/* $OpenBSD: control.c,v 1.36 2009/09/03 08:19:13 jacekm Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -512,7 +512,7 @@ control_dispatch_parent(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("control_dispatch_parent: imsg_get error"); + fatal("control_dispatch_parent: imsg_get error"); if (n == 0) break; @@ -575,7 +575,7 @@ control_dispatch_lka(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("control_dispatch_lka: imsg_get error"); + fatal("control_dispatch_lka: imsg_get error"); if (n == 0) break; @@ -620,7 +620,7 @@ control_dispatch_mfa(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("control_dispatch_mfa: imsg_get error"); + fatal("control_dispatch_mfa: imsg_get error"); if (n == 0) break; @@ -665,7 +665,7 @@ control_dispatch_queue(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("control_dispatch_queue: imsg_get error"); + fatal("control_dispatch_queue: imsg_get error"); if (n == 0) break; @@ -710,7 +710,7 @@ control_dispatch_runner(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("control_dispatch_runner: imsg_get error"); + fatal("control_dispatch_runner: imsg_get error"); if (n == 0) break; @@ -773,7 +773,7 @@ control_dispatch_smtp(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("control_dispatch_smtp: imsg_get error"); + fatal("control_dispatch_smtp: imsg_get error"); if (n == 0) break; diff --git a/usr.sbin/smtpd/dns.c b/usr.sbin/smtpd/dns.c index 1d85ba5225b..b61346789d6 100644 --- a/usr.sbin/smtpd/dns.c +++ b/usr.sbin/smtpd/dns.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dns.c,v 1.15 2009/08/08 00:02:22 gilles Exp $ */ +/* $OpenBSD: dns.c,v 1.16 2009/09/03 08:19:13 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -155,7 +155,7 @@ parent_dispatch_dns(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("parent_dispatch_dns: imsg_get error"); + fatal("parent_dispatch_dns: imsg_get error"); if (n == 0) break; @@ -255,7 +255,7 @@ dns_dispatch_parent(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("dns_dispatch_parent: imsg_get error"); + fatal("dns_dispatch_parent: imsg_get error"); if (n == 0) break; diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c index 543f7fafa95..ae051bff729 100644 --- a/usr.sbin/smtpd/lka.c +++ b/usr.sbin/smtpd/lka.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lka.c,v 1.62 2009/08/08 00:02:22 gilles Exp $ */ +/* $OpenBSD: lka.c,v 1.63 2009/09/03 08:19:13 jacekm Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -123,7 +123,7 @@ lka_dispatch_parent(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("lka_dispatch_parent: imsg_get error"); + fatal("lka_dispatch_parent: imsg_get error"); if (n == 0) break; @@ -322,7 +322,7 @@ lka_dispatch_mfa(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("lka_dispatch_mfa: imsg_get error"); + fatal("lka_dispatch_mfa: imsg_get error"); if (n == 0) break; @@ -459,7 +459,7 @@ lka_dispatch_mta(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("lka_dispatch_mta: imsg_get error"); + fatal("lka_dispatch_mta: imsg_get error"); if (n == 0) break; @@ -542,7 +542,7 @@ lka_dispatch_smtp(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("lka_dispatch_smtp: imsg_get error"); + fatal("lka_dispatch_smtp: imsg_get error"); if (n == 0) break; @@ -594,7 +594,7 @@ lka_dispatch_queue(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("lka_dispatch_queue: imsg_get error"); + fatal("lka_dispatch_queue: imsg_get error"); if (n == 0) break; @@ -639,7 +639,7 @@ lka_dispatch_runner(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("lka_dispatch_runner: imsg_get error"); + fatal("lka_dispatch_runner: imsg_get error"); if (n == 0) break; diff --git a/usr.sbin/smtpd/mda.c b/usr.sbin/smtpd/mda.c index 3405489dff5..57b823a61f4 100644 --- a/usr.sbin/smtpd/mda.c +++ b/usr.sbin/smtpd/mda.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mda.c,v 1.26 2009/09/02 12:47:06 jacekm Exp $ */ +/* $OpenBSD: mda.c,v 1.27 2009/09/03 08:19:13 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -85,7 +85,7 @@ mda_dispatch_parent(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("mda_dispatch_parent: imsg_get error"); + fatal("mda_dispatch_parent: imsg_get error"); if (n == 0) break; @@ -212,7 +212,7 @@ mda_dispatch_queue(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("mda_dispatch_queue: imsg_get error"); + fatal("mda_dispatch_queue: imsg_get error"); if (n == 0) break; @@ -257,7 +257,7 @@ mda_dispatch_runner(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("mda_dispatch_runner: imsg_get error"); + fatal("mda_dispatch_runner: imsg_get error"); if (n == 0) break; diff --git a/usr.sbin/smtpd/mfa.c b/usr.sbin/smtpd/mfa.c index 31c4b63d324..6ec5d55f78a 100644 --- a/usr.sbin/smtpd/mfa.c +++ b/usr.sbin/smtpd/mfa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfa.c,v 1.36 2009/06/06 04:14:21 pyr Exp $ */ +/* $OpenBSD: mfa.c,v 1.37 2009/09/03 08:19:13 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -93,7 +93,7 @@ mfa_dispatch_parent(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("mfa_dispatch_parent: imsg_get error"); + fatal("mfa_dispatch_parent: imsg_get error"); if (n == 0) break; @@ -225,7 +225,7 @@ mfa_dispatch_smtp(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("mfa_dispatch_smtp: imsg_get error"); + fatal("mfa_dispatch_smtp: imsg_get error"); if (n == 0) break; @@ -288,7 +288,7 @@ mfa_dispatch_lka(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("mfa_dispatch_lka: imsg_get error"); + fatal("mfa_dispatch_lka: imsg_get error"); if (n == 0) break; @@ -351,7 +351,7 @@ mfa_dispatch_control(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("mfa_dispatch_control: imsg_get error"); + fatal("mfa_dispatch_control: imsg_get error"); if (n == 0) break; diff --git a/usr.sbin/smtpd/mta.c b/usr.sbin/smtpd/mta.c index 94d74954e6f..8c2401027ea 100644 --- a/usr.sbin/smtpd/mta.c +++ b/usr.sbin/smtpd/mta.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mta.c,v 1.69 2009/08/26 16:40:19 jacekm Exp $ */ +/* $OpenBSD: mta.c,v 1.70 2009/09/03 08:19:13 jacekm Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -100,7 +100,7 @@ mta_dispatch_parent(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("mta_dispatch_parent: imsg_get error"); + fatal("mta_dispatch_parent: imsg_get error"); if (n == 0) break; @@ -182,7 +182,7 @@ mta_dispatch_lka(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("mta_dispatch_lka: imsg_get error"); + fatal("mta_dispatch_lka: imsg_get error"); if (n == 0) break; @@ -298,7 +298,7 @@ mta_dispatch_queue(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("mta_dispatch_queue: imsg_get error"); + fatal("mta_dispatch_queue: imsg_get error"); if (n == 0) break; @@ -365,7 +365,7 @@ mta_dispatch_runner(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("mta_dispatch_runner: imsg_get error"); + fatal("mta_dispatch_runner: imsg_get error"); if (n == 0) break; diff --git a/usr.sbin/smtpd/queue.c b/usr.sbin/smtpd/queue.c index 3690e409850..8237e8e4233 100644 --- a/usr.sbin/smtpd/queue.c +++ b/usr.sbin/smtpd/queue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: queue.c,v 1.68 2009/06/06 04:14:21 pyr Exp $ */ +/* $OpenBSD: queue.c,v 1.69 2009/09/03 08:19:13 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -99,7 +99,7 @@ queue_dispatch_control(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("queue_dispatch_control: imsg_get error"); + fatal("queue_dispatch_control: imsg_get error"); if (n == 0) break; @@ -144,7 +144,7 @@ queue_dispatch_smtp(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("queue_dispatch_smtp: imsg_get error"); + fatal("queue_dispatch_smtp: imsg_get error"); if (n == 0) break; @@ -280,7 +280,7 @@ queue_dispatch_mda(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("queue_dispatch_mda: imsg_get error"); + fatal("queue_dispatch_mda: imsg_get error"); if (n == 0) break; @@ -331,7 +331,7 @@ queue_dispatch_mta(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("queue_dispatch_mta: imsg_get error"); + fatal("queue_dispatch_mta: imsg_get error"); if (n == 0) break; @@ -394,7 +394,7 @@ queue_dispatch_lka(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("queue_dispatch_lka: imsg_get error"); + fatal("queue_dispatch_lka: imsg_get error"); if (n == 0) break; @@ -486,7 +486,7 @@ queue_dispatch_runner(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("queue_dispatch_runner: imsg_get error"); + fatal("queue_dispatch_runner: imsg_get error"); if (n == 0) break; diff --git a/usr.sbin/smtpd/runner.c b/usr.sbin/smtpd/runner.c index 206d60e2e7e..a08fbe0196c 100644 --- a/usr.sbin/smtpd/runner.c +++ b/usr.sbin/smtpd/runner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: runner.c,v 1.63 2009/08/27 11:37:30 jacekm Exp $ */ +/* $OpenBSD: runner.c,v 1.64 2009/09/03 08:19:13 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -126,7 +126,7 @@ runner_dispatch_parent(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("runner_dispatch_parent: imsg_get error"); + fatal("runner_dispatch_parent: imsg_get error"); if (n == 0) break; @@ -174,7 +174,7 @@ runner_dispatch_control(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("runner_dispatch_control: imsg_get error"); + fatal("runner_dispatch_control: imsg_get error"); if (n == 0) break; @@ -245,7 +245,7 @@ runner_dispatch_queue(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("runner_dispatch_queue: imsg_get error"); + fatal("runner_dispatch_queue: imsg_get error"); if (n == 0) break; @@ -299,7 +299,7 @@ runner_dispatch_mda(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("runner_dispatch_mda: imsg_get error"); + fatal("runner_dispatch_mda: imsg_get error"); if (n == 0) break; @@ -344,7 +344,7 @@ runner_dispatch_mta(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("runner_dispatch_mta: imsg_get error"); + fatal("runner_dispatch_mta: imsg_get error"); if (n == 0) break; @@ -390,7 +390,7 @@ runner_dispatch_lka(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("runner_dispatch_lka: imsg_get error"); + fatal("runner_dispatch_lka: imsg_get error"); if (n == 0) break; @@ -435,7 +435,7 @@ runner_dispatch_smtp(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("runner_dispatch_smtp: imsg_get error"); + fatal("runner_dispatch_smtp: imsg_get error"); if (n == 0) break; diff --git a/usr.sbin/smtpd/smtp.c b/usr.sbin/smtpd/smtp.c index 03bb2fd28a9..7bb1050c4d5 100644 --- a/usr.sbin/smtpd/smtp.c +++ b/usr.sbin/smtpd/smtp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtp.c,v 1.60 2009/08/06 16:46:57 gilles Exp $ */ +/* $OpenBSD: smtp.c,v 1.61 2009/09/03 08:19:13 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -97,7 +97,7 @@ smtp_dispatch_parent(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("smtp_dispatch_parent: imsg_get error"); + fatal("smtp_dispatch_parent: imsg_get error"); if (n == 0) break; @@ -247,7 +247,7 @@ smtp_dispatch_mfa(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("smtp_dispatch_mfa: imsg_get error"); + fatal("smtp_dispatch_mfa: imsg_get error"); if (n == 0) break; @@ -307,7 +307,7 @@ smtp_dispatch_lka(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("smtp_dispatch_lka: imsg_get error"); + fatal("smtp_dispatch_lka: imsg_get error"); if (n == 0) break; @@ -376,7 +376,7 @@ smtp_dispatch_queue(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("smtp_dispatch_queue: imsg_get error"); + fatal("smtp_dispatch_queue: imsg_get error"); if (n == 0) break; @@ -502,7 +502,7 @@ smtp_dispatch_control(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("smtp_dispatch_control: imsg_get error"); + fatal("smtp_dispatch_control: imsg_get error"); if (n == 0) break; @@ -609,7 +609,7 @@ smtp_dispatch_runner(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("smtp_dispatch_runner: imsg_get error"); + fatal("smtp_dispatch_runner: imsg_get error"); if (n == 0) break; diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index 3a57907672d..94e31feb315 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.c,v 1.83 2009/08/27 09:21:28 jacekm Exp $ */ +/* $OpenBSD: smtpd.c,v 1.84 2009/09/03 08:19:13 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -261,7 +261,7 @@ parent_dispatch_lka(int imsgfd, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("parent_dispatch_lka: imsg_get error"); + fatal("parent_dispatch_lka: imsg_get error"); if (n == 0) break; @@ -324,7 +324,7 @@ parent_dispatch_mfa(int fd, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("parent_dispatch_mfa: imsg_get error"); + fatal("parent_dispatch_mfa: imsg_get error"); if (n == 0) break; @@ -369,7 +369,7 @@ parent_dispatch_mta(int fd, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("parent_dispatch_mta: imsg_get error"); + fatal("parent_dispatch_mta: imsg_get error"); if (n == 0) break; @@ -414,7 +414,7 @@ parent_dispatch_mda(int fd, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("parent_dispatch_mda: imsg_get error"); + fatal("parent_dispatch_mda: imsg_get error"); if (n == 0) break; @@ -560,7 +560,7 @@ parent_dispatch_smtp(int fd, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("parent_dispatch_smtp: imsg_get error"); + fatal("parent_dispatch_smtp: imsg_get error"); if (n == 0) break; @@ -620,7 +620,7 @@ parent_dispatch_runner(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("parent_dispatch_runner: imsg_get error"); + fatal("parent_dispatch_runner: imsg_get error"); if (n == 0) break; @@ -670,7 +670,7 @@ parent_dispatch_control(int sig, short event, void *p) for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) - fatalx("parent_dispatch_control: imsg_get error"); + fatal("parent_dispatch_control: imsg_get error"); if (n == 0) break; |