summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/smtpctl.c
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2011-10-23 17:12:42 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2011-10-23 17:12:42 +0000
commit64b7a5c1b008ef83032593f294372b2905980851 (patch)
tree4e5b86cdb931babebcd1f9df59dc2a7077caa61b /usr.sbin/smtpd/smtpctl.c
parent8b3a50e556cbecf7d2c19e7e40fce0a2aa4d5341 (diff)
- smtpctl schedule no longer works, instead, use 'smtpctl schedule-id <id>'
- introduce 'smtpctl schedule-all' ok eric@
Diffstat (limited to 'usr.sbin/smtpd/smtpctl.c')
-rw-r--r--usr.sbin/smtpd/smtpctl.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c
index 3c97118d018..6c5be25191a 100644
--- a/usr.sbin/smtpd/smtpctl.c
+++ b/usr.sbin/smtpd/smtpctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpctl.c,v 1.68 2011/10/23 09:30:07 gilles Exp $ */
+/* $OpenBSD: smtpctl.c,v 1.69 2011/10/23 17:12:41 gilles Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -146,6 +146,8 @@ connected:
errx(1, "invalid msgid/evpid");
if (errno == ERANGE && ulval == ULLONG_MAX)
errx(1, "invalid msgid/evpid");
+ if (ulval == 0)
+ errx(1, "invalid msgid/evpid");
if (res->action == SCHEDULE)
imsg_compose(ibuf, IMSG_RUNNER_SCHEDULE, 0, 0, -1, &ulval,
@@ -156,6 +158,14 @@ connected:
break;
}
+ case SCHEDULE_ALL: {
+ u_int64_t ulval = 0;
+
+ imsg_compose(ibuf, IMSG_RUNNER_SCHEDULE, 0, 0, -1, &ulval,
+ sizeof(ulval));
+ break;
+ }
+
case SHUTDOWN:
imsg_compose(ibuf, IMSG_CTL_SHUTDOWN, 0, 0, -1, NULL, 0);
break;
@@ -215,6 +225,7 @@ connected:
/* case RELOAD: */
case REMOVE:
case SCHEDULE:
+ case SCHEDULE_ALL:
case SHUTDOWN:
case PAUSE_MDA:
case PAUSE_MTA: