summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd
diff options
context:
space:
mode:
authorJacek Masiulaniec <jacekm@cvs.openbsd.org>2009-03-29 14:18:21 +0000
committerJacek Masiulaniec <jacekm@cvs.openbsd.org>2009-03-29 14:18:21 +0000
commit411f09d88bf2ce87a1b0767340ec1bffaa0444c5 (patch)
treede28bcbe59ddbac3ec4e91ba0f5a3fff026a7abb /usr.sbin/smtpd
parent2d278b45fcc694aac4935bcaddf4197306fcd0b1 (diff)
turn some log_debugs into log_warns or even fatals; "looks ok" gilles@
Diffstat (limited to 'usr.sbin/smtpd')
-rw-r--r--usr.sbin/smtpd/control.c26
-rw-r--r--usr.sbin/smtpd/lka.c28
-rw-r--r--usr.sbin/smtpd/mda.c14
-rw-r--r--usr.sbin/smtpd/mfa.c18
-rw-r--r--usr.sbin/smtpd/mta.c18
-rw-r--r--usr.sbin/smtpd/queue.c34
-rw-r--r--usr.sbin/smtpd/runner.c22
-rw-r--r--usr.sbin/smtpd/smtp.c22
-rw-r--r--usr.sbin/smtpd/smtpd.c29
9 files changed, 103 insertions, 108 deletions
diff --git a/usr.sbin/smtpd/control.c b/usr.sbin/smtpd/control.c
index 710ce3f27a5..ce1ce84ab93 100644
--- a/usr.sbin/smtpd/control.c
+++ b/usr.sbin/smtpd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.20 2009/03/18 14:48:27 gilles Exp $ */
+/* $OpenBSD: control.c,v 1.21 2009/03/29 14:18:20 jacekm Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -565,9 +565,9 @@ control_dispatch_parent(int sig, short event, void *p)
break;
}
default:
- log_debug("control_dispatch_parent: unexpected imsg %d",
+ log_warnx("control_dispatch_parent: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("control_dispatch_parent: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -621,9 +621,9 @@ control_dispatch_lka(int sig, short event, void *p)
break;
}
default:
- log_debug("control_dispatch_lka: unexpected imsg %d",
+ log_warnx("control_dispatch_lka: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("control_dispatch_lka: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -687,9 +687,9 @@ control_dispatch_mfa(int sig, short event, void *p)
break;
}
default:
- log_debug("control_dispatch_mfa: unexpected imsg %d",
+ log_warnx("control_dispatch_mfa: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("control_dispatch_mfa: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -836,9 +836,9 @@ control_dispatch_queue(int sig, short event, void *p)
break;
}
default:
- log_debug("control_dispatch_queue: unexpected imsg %d",
+ log_warnx("control_dispatch_queue: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("control_dispatch_queue: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -913,9 +913,9 @@ control_dispatch_runner(int sig, short event, void *p)
break;
}
default:
- log_debug("control_dispatch_runner: unexpected imsg %d",
+ log_warnx("control_dispatch_runner: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("control_dispatch_runner: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -974,9 +974,9 @@ control_dispatch_smtp(int sig, short event, void *p)
break;
}
default:
- log_debug("control_dispatch_smtp: unexpected imsg %d",
+ log_warnx("control_dispatch_smtp: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("control_dispatch_smtp: unexpected imsg");
}
imsg_free(&imsg);
}
diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c
index 19c335f24e6..31ce61d6acf 100644
--- a/usr.sbin/smtpd/lka.c
+++ b/usr.sbin/smtpd/lka.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lka.c,v 1.37 2009/03/22 22:53:47 gilles Exp $ */
+/* $OpenBSD: lka.c,v 1.38 2009/03/29 14:18:20 jacekm Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -176,9 +176,9 @@ lka_dispatch_parent(int sig, short event, void *p)
break;
}
default:
- log_debug("parent_dispatch_lka: unexpected imsg %d",
+ log_warnx("lka_dispatch_parent: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("lka_dispatch_parent: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -312,9 +312,9 @@ lka_dispatch_mfa(int sig, short event, void *p)
break;
}
default:
- log_debug("lka_dispatch_mfa: unexpected imsg %d",
+ log_warnx("lka_dispatch_mfa: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("lka_dispatch_mfa: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -525,9 +525,9 @@ lka_dispatch_mta(int sig, short event, void *p)
}
default:
- log_debug("lka_dispatch_mta: unexpected imsg %d",
+ log_warnx("lka_dispatch_mta: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("lka_dispatch_mta: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -597,9 +597,9 @@ lka_dispatch_smtp(int sig, short event, void *p)
break;
}
default:
- log_debug("lka_dispatch_mfa: unexpected imsg %d",
+ log_warnx("lka_dispatch_smtp: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("lka_dispatch_smtp: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -643,9 +643,9 @@ lka_dispatch_queue(int sig, short event, void *p)
switch (imsg.hdr.type) {
default:
- log_debug("lka_dispatch_queue: unexpected imsg %d",
- imsg.hdr.type);
- break;
+ log_warnx("lka_dispatch_queue: got imsg %d",
+ imsg.hdr.type);
+ fatalx("lka_dispatch_queue: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -689,9 +689,9 @@ lka_dispatch_runner(int sig, short event, void *p)
switch (imsg.hdr.type) {
default:
- log_debug("lka_dispatch_runner: unexpected imsg %d",
+ log_warnx("lka_dispatch_runner: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("lka_dispatch_runner: unexpected imsg");
}
imsg_free(&imsg);
}
diff --git a/usr.sbin/smtpd/mda.c b/usr.sbin/smtpd/mda.c
index 31609d4a852..a7707950632 100644
--- a/usr.sbin/smtpd/mda.c
+++ b/usr.sbin/smtpd/mda.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mda.c,v 1.12 2009/03/23 08:25:15 tobias Exp $ */
+/* $OpenBSD: mda.c,v 1.13 2009/03/29 14:18:20 jacekm Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -175,9 +175,9 @@ mda_dispatch_parent(int sig, short event, void *p)
break;
}
default:
- log_debug("mda_dispatch_parent: unexpected imsg %d",
+ log_warnx("mda_dispatch_parent: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("mda_dispatch_parent: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -221,9 +221,9 @@ mda_dispatch_queue(int sig, short event, void *p)
switch (imsg.hdr.type) {
default:
- log_debug("parent_dispatch_queue: unexpected imsg %d",
+ log_warnx("mda_dispatch_queue: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("mda_dispatch_queue: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -345,9 +345,9 @@ mda_dispatch_runner(int sig, short event, void *p)
break;
}
default:
- log_debug("parent_dispatch_runner: unexpected imsg %d",
+ log_warnx("mda_dispatch_runner: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("mda_dispatch_runner: unexpected imsg");
}
imsg_free(&imsg);
}
diff --git a/usr.sbin/smtpd/mfa.c b/usr.sbin/smtpd/mfa.c
index 03081ea9c0d..d9b6cded642 100644
--- a/usr.sbin/smtpd/mfa.c
+++ b/usr.sbin/smtpd/mfa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfa.c,v 1.17 2009/03/08 19:11:22 gilles Exp $ */
+/* $OpenBSD: mfa.c,v 1.18 2009/03/29 14:18:20 jacekm Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -105,9 +105,9 @@ mfa_dispatch_parent(int sig, short event, void *p)
switch (imsg.hdr.type) {
default:
- log_debug("parent_dispatch_mfa: unexpected imsg %d",
+ log_warnx("mfa_dispatch_parent: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("mfa_dispatch_parent: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -157,9 +157,9 @@ mfa_dispatch_smtp(int sig, short event, void *p)
mfa_test_rcpt(env, imsg.data, PROC_SMTP);
break;
default:
- log_debug("mfa_dispatch_smtp: unexpected imsg %d",
+ log_warnx("mfa_dispatch_smtp: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("mfa_dispatch_smtp: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -223,9 +223,9 @@ mfa_dispatch_lka(int sig, short event, void *p)
break;
}
default:
- log_debug("mfa_dispatch_lka: unexpected imsg %d",
+ log_warnx("mfa_dispatch_lka: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("mfa_dispatch_lka: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -272,9 +272,9 @@ mfa_dispatch_control(int sig, short event, void *p)
mfa_test_rcpt(env, imsg.data, PROC_CONTROL);
break;
default:
- log_debug("mfa_dispatch_smtp: unexpected imsg %d",
+ log_warnx("mfa_dispatch_control: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("mfa_dispatch_control: unexpected imsg");
}
imsg_free(&imsg);
}
diff --git a/usr.sbin/smtpd/mta.c b/usr.sbin/smtpd/mta.c
index 56dbf706dbb..7d9ba336cdb 100644
--- a/usr.sbin/smtpd/mta.c
+++ b/usr.sbin/smtpd/mta.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mta.c,v 1.38 2009/03/19 00:12:32 gilles Exp $ */
+/* $OpenBSD: mta.c,v 1.39 2009/03/29 14:18:20 jacekm Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -108,9 +108,9 @@ mta_dispatch_parent(int sig, short event, void *p)
switch (imsg.hdr.type) {
default:
- log_debug("parent_dispatch_mta: unexpected imsg %d",
+ log_warnx("mta_dispatch_parent: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("mta_dispatch_parent: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -202,9 +202,9 @@ mta_dispatch_lka(int sig, short event, void *p)
break;
}
default:
- log_debug("mta_dispatch_lka: unexpected imsg %d",
+ log_warnx("mta_dispatch_parent: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("mta_dispatch_lka: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -269,9 +269,9 @@ mta_dispatch_queue(int sig, short event, void *p)
break;
}
default:
- log_debug("parent_dispatch_mta: unexpected imsg %d",
+ log_warnx("mta_dispatch_queue: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("mta_dispatch_queue: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -389,9 +389,9 @@ mta_dispatch_runner(int sig, short event, void *p)
break;
}
default:
- log_debug("mta_dispatch_runner: unexpected imsg %d",
+ log_warnx("mta_dispatch_runner: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("mta_dispatch_runner: unexpected imsg");
}
imsg_free(&imsg);
}
diff --git a/usr.sbin/smtpd/queue.c b/usr.sbin/smtpd/queue.c
index d529eaf716c..278ee2207ab 100644
--- a/usr.sbin/smtpd/queue.c
+++ b/usr.sbin/smtpd/queue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: queue.c,v 1.57 2009/03/01 12:12:58 jacekm Exp $ */
+/* $OpenBSD: queue.c,v 1.58 2009/03/29 14:18:20 jacekm Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -111,7 +111,7 @@ queue_dispatch_control(int sig, short event, void *p)
struct message *messagep;
struct submit_status ss;
- log_debug("mfa_dispatch_control: creating message file");
+ log_debug("queue_dispatch_control: creating message file");
messagep = imsg.data;
ss.id = messagep->session_id;
@@ -171,9 +171,9 @@ queue_dispatch_control(int sig, short event, void *p)
break;
}
default:
- log_debug("queue_dispatch_control: unexpected imsg %d",
+ log_warnx("queue_dispatch_control: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("queue_dispatch_control: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -220,7 +220,7 @@ queue_dispatch_smtp(int sig, short event, void *p)
struct message *messagep;
struct submit_status ss;
- log_debug("mfa_dispatch_smtp: creating message file");
+ log_debug("queue_dispatch_smtp: creating message file");
messagep = imsg.data;
ss.id = messagep->session_id;
ss.code = 250;
@@ -274,9 +274,9 @@ queue_dispatch_smtp(int sig, short event, void *p)
break;
}
default:
- log_debug("queue_dispatch_smtp: unexpected imsg %d",
+ log_warnx("queue_dispatch_smtp: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("queue_dispatch_smtp: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -327,9 +327,8 @@ queue_dispatch_mda(int sig, short event, void *p)
}
default:
- log_debug("queue_dispatch_mda: unexpected imsg %d",
- imsg.hdr.type);
- break;
+ log_warnx("got imsg %d", imsg.hdr.type);
+ fatalx("queue_dispatch_mda: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -391,9 +390,8 @@ queue_dispatch_mta(int sig, short event, void *p)
}
default:
- log_debug("queue_dispatch_mda: unexpected imsg %d",
- imsg.hdr.type);
- break;
+ log_warnx("got imsg %d", imsg.hdr.type);
+ fatalx("queue_dispatch_mda: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -493,9 +491,8 @@ queue_dispatch_lka(int sig, short event, void *p)
}
default:
- log_debug("queue_dispatch_lka: unexpected imsg %d",
- imsg.hdr.type);
- break;
+ log_warnx("got imsg %d", imsg.hdr.type);
+ fatalx("queue_dispatch_lka: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -539,9 +536,8 @@ queue_dispatch_runner(int sig, short event, void *p)
switch (imsg.hdr.type) {
default:
- log_debug("queue_dispatch_runner: unexpected imsg %d",
- imsg.hdr.type);
- break;
+ log_warnx("got imsg %d", imsg.hdr.type);
+ fatalx("queue_dispatch_runner: unexpected imsg");
}
imsg_free(&imsg);
}
diff --git a/usr.sbin/smtpd/runner.c b/usr.sbin/smtpd/runner.c
index 4144c425d1d..92023e7a788 100644
--- a/usr.sbin/smtpd/runner.c
+++ b/usr.sbin/smtpd/runner.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: runner.c,v 1.37 2009/03/22 22:53:47 gilles Exp $ */
+/* $OpenBSD: runner.c,v 1.38 2009/03/29 14:18:20 jacekm Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -165,9 +165,9 @@ runner_dispatch_control(int sig, short event, void *p)
break;
}
default:
- log_debug("queue_dispatch_control: unexpected imsg %d",
+ log_warnx("runner_dispatch_control: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("runner_dispatch_control: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -216,9 +216,9 @@ runner_dispatch_queue(int sig, short event, void *p)
break;
}
default:
- log_debug("runner_dispatch_queue: unexpected imsg %d",
+ log_warnx("runner_dispatch_queue: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("runner_dispatch_queue: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -262,9 +262,9 @@ runner_dispatch_mda(int sig, short event, void *p)
switch (imsg.hdr.type) {
default:
- log_debug("runner_dispatch_mda: unexpected imsg %d",
+ log_warnx("runner_dispatch_mda: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("runner_dispatch_mda: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -309,9 +309,9 @@ runner_dispatch_mta(int sig, short event, void *p)
switch (imsg.hdr.type) {
default:
- log_debug("runner_dispatch_mta: unexpected imsg %d",
+ log_warnx("runner_dispatch_mta: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("runner_dispatch_mta: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -355,9 +355,9 @@ runner_dispatch_lka(int sig, short event, void *p)
switch (imsg.hdr.type) {
default:
- log_debug("runner_dispatch_lka: unexpected imsg %d",
+ log_warnx("runner_dispatch_lka: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("runner_dispatch_lka: unexpected imsg");
}
imsg_free(&imsg);
}
diff --git a/usr.sbin/smtpd/smtp.c b/usr.sbin/smtpd/smtp.c
index 66e77c7d7e1..3fbf2f33f96 100644
--- a/usr.sbin/smtpd/smtp.c
+++ b/usr.sbin/smtpd/smtp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtp.c,v 1.31 2009/03/15 19:32:10 gilles Exp $ */
+/* $OpenBSD: smtp.c,v 1.32 2009/03/29 14:18:20 jacekm Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -192,9 +192,9 @@ smtp_dispatch_parent(int sig, short event, void *p)
break;
}
default:
- log_debug("parent_dispatch_smtp: unexpected imsg %d",
+ log_warnx("smtp_dispatch_parent: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("smtp_dispatch_parent: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -262,9 +262,9 @@ smtp_dispatch_mfa(int sig, short event, void *p)
break;
}
default:
- log_debug("smtp_dispatch_mfa: unexpected imsg %d",
+ log_warnx("smtp_dispatch_mfa: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("smtp_dispatch_mfa: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -329,9 +329,9 @@ smtp_dispatch_lka(int sig, short event, void *p)
break;
}
default:
- log_debug("smtp_dispatch_lka: unexpected imsg %d",
+ log_warnx("smtp_dispatch_lka: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("smtp_dispatch_lka: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -487,9 +487,9 @@ smtp_dispatch_queue(int sig, short event, void *p)
break;
}
default:
- log_debug("smtp_dispatch_queue: unexpected imsg %d",
+ log_warnx("smtp_dispatch_queue: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("smtp_dispatch_queue: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -547,9 +547,9 @@ smtp_dispatch_control(int sig, short event, void *p)
break;
}
default:
- log_debug("smtp_dispatch_control: unexpected imsg %d",
+ log_warnx("smtp_dispatch_control: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("smtp_dispatch_control: unexpected imsg");
}
imsg_free(&imsg);
}
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index 215e9998d49..7328e0a4707 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.c,v 1.50 2009/03/22 22:53:47 gilles Exp $ */
+/* $OpenBSD: smtpd.c,v 1.51 2009/03/29 14:18:20 jacekm Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -209,9 +209,9 @@ parent_dispatch_lka(int fd, short event, void *p)
break;
}
default:
- log_debug("parent_dispatch_lka: unexpected imsg %d",
+ log_warnx("parent_dispatch_lka: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("parent_dispatch_lka: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -255,9 +255,9 @@ parent_dispatch_mfa(int fd, short event, void *p)
switch (imsg.hdr.type) {
default:
- log_debug("parent_dispatch_lka: unexpected imsg %d",
+ log_warnx("parent_dispatch_mfa: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("parent_dispatch_mfa: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -399,9 +399,9 @@ parent_dispatch_mda(int fd, short event, void *p)
break;
}
default:
- log_debug("parent_dispatch_mda: unexpected imsg %d",
+ log_warnx("parent_dispatch_mfa: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("parent_dispatch_mda: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -473,9 +473,9 @@ parent_dispatch_smtp(int fd, short event, void *p)
break;
}
default:
- log_debug("parent_dispatch_smtp: unexpected imsg %d",
+ log_warnx("parent_dispatch_smtp: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("parent_dispatch_smtp: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -527,9 +527,9 @@ parent_dispatch_control(int sig, short event, void *p)
break;
}
default:
- log_debug("parent_dispatch_control: unexpected imsg %d",
+ log_warnx("parent_dispatch_control: got imsg %d",
imsg.hdr.type);
- break;
+ fatalx("parent_dispatch_control: unexpected imsg");
}
imsg_free(&imsg);
}
@@ -579,7 +579,7 @@ parent_sig_handler(int sig, short event, void *p)
lookup.pid = pid;
mdaproc = SPLAY_FIND(mdaproctree, &env->mdaproc_queue, &lookup);
if (mdaproc == NULL)
- errx(1, "received SIGCHLD but no known child for that pid (#%d)", pid);
+ fatalx("unexpected SIGCHLD");
if (WIFEXITED(status) && !WIFSIGNALED(status)) {
switch (WEXITSTATUS(status)) {
@@ -590,11 +590,11 @@ parent_sig_handler(int sig, short event, void *p)
log_debug("DEBUG: external mda reported temporary failure");
break;
default:
- log_debug("DEBUG: external mda reported permanent failure");
+ log_warnx("external mda returned %d", WEXITSTATUS(status));
}
}
else {
- log_debug("DEBUG: external mda process has terminated in a baaaad way");
+ log_warnx("external mda terminated abnormally");
}
SPLAY_REMOVE(mdaproctree, &env->mdaproc_queue,
@@ -603,7 +603,6 @@ parent_sig_handler(int sig, short event, void *p)
}
} while (pid > 0 || (pid == -1 && errno == EINTR));
- /**/
break;
default:
fatalx("unexpected signal");
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 23:03:49 +0000