summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/smtpd')
-rw-r--r--usr.sbin/smtpd/control.c14
-rw-r--r--usr.sbin/smtpd/lka.c14
-rw-r--r--usr.sbin/smtpd/mda.c8
-rw-r--r--usr.sbin/smtpd/mfa.c10
-rw-r--r--usr.sbin/smtpd/mta.c10
-rw-r--r--usr.sbin/smtpd/queue.c14
-rw-r--r--usr.sbin/smtpd/runner.c12
-rw-r--r--usr.sbin/smtpd/smtp.c12
-rw-r--r--usr.sbin/smtpd/smtpd.c12
9 files changed, 53 insertions, 53 deletions
diff --git a/usr.sbin/smtpd/control.c b/usr.sbin/smtpd/control.c
index 10bda60485e..803150462cc 100644
--- a/usr.sbin/smtpd/control.c
+++ b/usr.sbin/smtpd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.22 2009/04/16 15:35:06 jacekm Exp $ */
+/* $OpenBSD: control.c,v 1.23 2009/04/21 14:37:32 eric Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -496,7 +496,7 @@ control_dispatch_parent(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("control_dispatch_parent: imsg_read error");
+ fatalx("control_dispatch_parent: imsg_get error");
if (n == 0)
break;
@@ -557,7 +557,7 @@ control_dispatch_lka(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("control_dispatch_lka: imsg_read error");
+ fatalx("control_dispatch_lka: imsg_get error");
if (n == 0)
break;
@@ -603,7 +603,7 @@ control_dispatch_mfa(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("control_dispatch_mfa: imsg_read error");
+ fatalx("control_dispatch_mfa: imsg_get error");
if (n == 0)
break;
@@ -649,7 +649,7 @@ control_dispatch_queue(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("control_dispatch_queue: imsg_read error");
+ fatalx("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)
- fatal("control_dispatch_runner: imsg_read error");
+ fatalx("control_dispatch_runner: imsg_get error");
if (n == 0)
break;
@@ -787,7 +787,7 @@ control_dispatch_smtp(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("control_dispatch_smtp: imsg_read error");
+ fatalx("control_dispatch_smtp: imsg_get error");
if (n == 0)
break;
diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c
index 371abb36594..4a7c3ddf6b0 100644
--- a/usr.sbin/smtpd/lka.c
+++ b/usr.sbin/smtpd/lka.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lka.c,v 1.40 2009/04/09 19:49:34 jacekm Exp $ */
+/* $OpenBSD: lka.c,v 1.41 2009/04/21 14:37:32 eric Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -114,7 +114,7 @@ lka_dispatch_parent(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("parent_dispatch_lka: imsg_read error");
+ fatalx("lka_dispatch_parent: imsg_get error");
if (n == 0)
break;
@@ -216,7 +216,7 @@ lka_dispatch_mfa(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("lka_dispatch_mfa: imsg_read error");
+ fatalx("lka_dispatch_mfa: imsg_get error");
if (n == 0)
break;
@@ -352,7 +352,7 @@ lka_dispatch_mta(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("lka_dispatch_mta: imsg_read error");
+ fatalx("lka_dispatch_mta: imsg_get error");
if (n == 0)
break;
@@ -565,7 +565,7 @@ lka_dispatch_smtp(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("lka_dispatch_mfa: imsg_read error");
+ fatalx("lka_dispatch_smtp: imsg_get error");
if (n == 0)
break;
@@ -637,7 +637,7 @@ lka_dispatch_queue(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("lka_dispatch_queue: imsg_read error");
+ fatalx("lka_dispatch_queue: imsg_get error");
if (n == 0)
break;
@@ -683,7 +683,7 @@ lka_dispatch_runner(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("lka_dispatch_runner: imsg_read error");
+ fatalx("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 a7707950632..8818bdfc61c 100644
--- a/usr.sbin/smtpd/mda.c
+++ b/usr.sbin/smtpd/mda.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mda.c,v 1.13 2009/03/29 14:18:20 jacekm Exp $ */
+/* $OpenBSD: mda.c,v 1.14 2009/04/21 14:37:32 eric Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -87,7 +87,7 @@ mda_dispatch_parent(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("mda_dispatch_parent: imsg_read error");
+ fatalx("mda_dispatch_parent: imsg_get error");
if (n == 0)
break;
@@ -215,7 +215,7 @@ mda_dispatch_queue(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("parent_dispatch_queue: imsg_read error");
+ fatalx("mda_dispatch_queue: imsg_get error");
if (n == 0)
break;
@@ -261,7 +261,7 @@ mda_dispatch_runner(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("parent_dispatch_runner: imsg_read error");
+ fatalx("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 9836e6f4f8a..348dbba4e4e 100644
--- a/usr.sbin/smtpd/mfa.c
+++ b/usr.sbin/smtpd/mfa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfa.c,v 1.19 2009/04/16 15:35:06 jacekm Exp $ */
+/* $OpenBSD: mfa.c,v 1.20 2009/04/21 14:37:32 eric Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -99,7 +99,7 @@ mfa_dispatch_parent(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("parent_dispatch_mfa: imsg_read error");
+ fatalx("mfa_dispatch_parent: imsg_get error");
if (n == 0)
break;
@@ -145,7 +145,7 @@ mfa_dispatch_smtp(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("mfa_dispatch_smtp: imsg_read error");
+ fatalx("mfa_dispatch_smtp: imsg_get error");
if (n == 0)
break;
@@ -197,7 +197,7 @@ mfa_dispatch_lka(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("mfa_dispatch_lka: imsg_read error");
+ fatalx("mfa_dispatch_lka: imsg_get error");
if (n == 0)
break;
@@ -259,7 +259,7 @@ mfa_dispatch_control(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("mfa_dispatch_smtp: imsg_read error");
+ fatalx("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 e6d94d1c08c..ade8e0bd09a 100644
--- a/usr.sbin/smtpd/mta.c
+++ b/usr.sbin/smtpd/mta.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mta.c,v 1.41 2009/04/15 20:02:12 jacekm Exp $ */
+/* $OpenBSD: mta.c,v 1.42 2009/04/21 14:37:32 eric Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -102,7 +102,7 @@ mta_dispatch_parent(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("parent_dispatch_mta: imsg_read error");
+ fatalx("mta_dispatch_parent: imsg_get error");
if (n == 0)
break;
@@ -148,7 +148,7 @@ mta_dispatch_lka(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("mta_dispatch_lka: imsg_read error");
+ fatalx("mta_dispatch_lka: imsg_get error");
if (n == 0)
break;
@@ -242,7 +242,7 @@ mta_dispatch_queue(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("parent_dispatch_mta: imsg_read error");
+ fatalx("mta_dispatch_queue: imsg_get error");
if (n == 0)
break;
@@ -309,7 +309,7 @@ mta_dispatch_runner(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("mta_dispatch_runner: imsg_read error");
+ fatalx("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 2e824873521..aee6760e501 100644
--- a/usr.sbin/smtpd/queue.c
+++ b/usr.sbin/smtpd/queue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: queue.c,v 1.60 2009/04/18 21:01:20 jacekm Exp $ */
+/* $OpenBSD: queue.c,v 1.61 2009/04/21 14:37:32 eric Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -102,7 +102,7 @@ queue_dispatch_control(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("queue_dispatch_control: imsg_read error");
+ fatalx("queue_dispatch_control: imsg_get error");
if (n == 0)
break;
@@ -156,7 +156,7 @@ queue_dispatch_smtp(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("queue_dispatch_smtp: imsg_read error");
+ fatalx("queue_dispatch_smtp: imsg_get error");
if (n == 0)
break;
@@ -288,7 +288,7 @@ queue_dispatch_mda(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("queue_dispatch_mda: imsg_read error");
+ fatalx("queue_dispatch_mda: imsg_get error");
if (n == 0)
break;
@@ -340,7 +340,7 @@ queue_dispatch_mta(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("queue_dispatch_mda: imsg_read error");
+ fatalx("queue_dispatch_mta: imsg_get error");
if (n == 0)
break;
@@ -403,7 +403,7 @@ queue_dispatch_lka(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("queue_dispatch_lka: imsg_read error");
+ fatalx("queue_dispatch_lka: imsg_get error");
if (n == 0)
break;
@@ -494,7 +494,7 @@ queue_dispatch_runner(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("queue_dispatch_runner: imsg_read error");
+ fatalx("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 c21150c37c3..a52abac2f74 100644
--- a/usr.sbin/smtpd/runner.c
+++ b/usr.sbin/smtpd/runner.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: runner.c,v 1.40 2009/04/18 21:13:56 jacekm Exp $ */
+/* $OpenBSD: runner.c,v 1.41 2009/04/21 14:37:32 eric Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -125,7 +125,7 @@ runner_dispatch_control(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("runner_dispatch_control: imsg_read error");
+ fatalx("runner_dispatch_control: imsg_get error");
if (n == 0)
break;
@@ -205,7 +205,7 @@ runner_dispatch_queue(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("runner_dispatch_queue: imsg_read error");
+ fatalx("runner_dispatch_queue: imsg_get error");
if (n == 0)
break;
@@ -256,7 +256,7 @@ runner_dispatch_mda(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("runner_dispatch_mda: imsg_read error");
+ fatalx("runner_dispatch_mda: imsg_get error");
if (n == 0)
break;
@@ -302,7 +302,7 @@ runner_dispatch_mta(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("runner_dispatch_mta: imsg_read error");
+ fatalx("runner_dispatch_mta: imsg_get error");
if (n == 0)
break;
@@ -349,7 +349,7 @@ runner_dispatch_lka(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("runner_dispatch_lka: imsg_read error");
+ fatalx("runner_dispatch_lka: imsg_get error");
if (n == 0)
break;
diff --git a/usr.sbin/smtpd/smtp.c b/usr.sbin/smtpd/smtp.c
index fe8c9cb55f7..c43d7ae59c0 100644
--- a/usr.sbin/smtpd/smtp.c
+++ b/usr.sbin/smtpd/smtp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtp.c,v 1.35 2009/04/20 17:07:01 jacekm Exp $ */
+/* $OpenBSD: smtp.c,v 1.36 2009/04/21 14:37:32 eric 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)
- fatal("parent_dispatch_smtp: imsg_read error");
+ fatalx("smtp_dispatch_parent: imsg_get error");
if (n == 0)
break;
@@ -230,7 +230,7 @@ smtp_dispatch_mfa(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("smtp_dispatch_mfa: imsg_read error");
+ fatalx("smtp_dispatch_mfa: imsg_get error");
if (n == 0)
break;
@@ -300,7 +300,7 @@ smtp_dispatch_lka(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("smtp_dispatch_lka: imsg_read error");
+ fatalx("smtp_dispatch_lka: imsg_get error");
if (n == 0)
break;
@@ -367,7 +367,7 @@ smtp_dispatch_queue(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("smtp_dispatch_queue: imsg_read error");
+ fatalx("smtp_dispatch_queue: imsg_get error");
if (n == 0)
break;
@@ -525,7 +525,7 @@ smtp_dispatch_control(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("smtp_dispatch_control: imsg_read error");
+ fatalx("smtp_dispatch_control: imsg_get error");
if (n == 0)
break;
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index 9c0683df78e..cd19b080aee 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.c,v 1.53 2009/04/15 20:36:48 jacekm Exp $ */
+/* $OpenBSD: smtpd.c,v 1.54 2009/04/21 14:37:32 eric Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -189,7 +189,7 @@ parent_dispatch_lka(int fd, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("parent_dispatch_lka: imsg_read error");
+ fatalx("parent_dispatch_lka: imsg_get error");
if (n == 0)
break;
@@ -249,7 +249,7 @@ parent_dispatch_mfa(int fd, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("parent_dispatch_lka: imsg_read error");
+ fatalx("parent_dispatch_mfa: imsg_get error");
if (n == 0)
break;
@@ -295,7 +295,7 @@ parent_dispatch_mda(int fd, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("parent_dispatch_mda: imsg_read error");
+ fatalx("parent_dispatch_mda: imsg_get error");
if (n == 0)
break;
@@ -439,7 +439,7 @@ parent_dispatch_smtp(int fd, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("parent_dispatch_smtp: imsg_read error");
+ fatalx("parent_dispatch_smtp: imsg_get error");
if (n == 0)
break;
@@ -531,7 +531,7 @@ parent_dispatch_control(int sig, short event, void *p)
for (;;) {
if ((n = imsg_get(ibuf, &imsg)) == -1)
- fatal("parent_dispatch_control: imsg_read error");
+ fatalx("parent_dispatch_control: imsg_get error");
if (n == 0)
break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 04:41:05 +0000