summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/smtpd/control.c4
-rw-r--r--usr.sbin/smtpd/parser.c4
-rw-r--r--usr.sbin/smtpd/smtpctl.c6
3 files changed, 9 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/control.c b/usr.sbin/smtpd/control.c
index 020160864fe..4a5768aa178 100644
--- a/usr.sbin/smtpd/control.c
+++ b/usr.sbin/smtpd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.38 2009/09/18 00:04:26 jacekm Exp $ */
+/* $OpenBSD: control.c,v 1.39 2009/10/25 19:46:31 gilles Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -348,6 +348,7 @@ control_dispatch_ext(int fd, short event, void *arg)
imsg_compose_event(env->sc_ievs[PROC_RUNNER], IMSG_RUNNER_SCHEDULE, 0, 0, -1, s, sizeof(*s));
break;
}
+/*
case IMSG_CONF_RELOAD: {
struct reload r;
@@ -367,6 +368,7 @@ control_dispatch_ext(int fd, short event, void *arg)
imsg_compose_event(env->sc_ievs[PROC_PARENT], IMSG_CONF_RELOAD, 0, 0, -1, &r, sizeof(r));
break;
}
+*/
case IMSG_CTL_SHUTDOWN:
/* NEEDS_FIX */
log_debug("received shutdown request");
diff --git a/usr.sbin/smtpd/parser.c b/usr.sbin/smtpd/parser.c
index 16943f40bfe..8fe1a89a134 100644
--- a/usr.sbin/smtpd/parser.c
+++ b/usr.sbin/smtpd/parser.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parser.c,v 1.8 2009/08/08 00:16:49 gilles Exp $ */
+/* $OpenBSD: parser.c,v 1.9 2009/10/25 19:46:31 gilles Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -66,7 +66,7 @@ static const struct token t_main[] = {
{KEYWORD, "show", NONE, t_show},
{KEYWORD, "monitor", MONITOR, NULL},
{KEYWORD, "pause", NONE, t_pause},
- {KEYWORD, "reload", RELOAD, NULL},
+/* {KEYWORD, "reload", RELOAD, NULL},*/
{KEYWORD, "resume", NONE, t_resume},
{KEYWORD, "stop", SHUTDOWN, NULL},
{KEYWORD, "schedule", SCHEDULE, t_schedule},
diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c
index 9e0fa589524..a085aaeb1fc 100644
--- a/usr.sbin/smtpd/smtpctl.c
+++ b/usr.sbin/smtpd/smtpctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpctl.c,v 1.38 2009/09/12 12:24:51 jacekm Exp $ */
+/* $OpenBSD: smtpctl.c,v 1.39 2009/10/25 19:46:31 gilles Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -153,9 +153,11 @@ connected:
case SHUTDOWN:
imsg_compose(ibuf, IMSG_CTL_SHUTDOWN, 0, 0, -1, NULL, 0);
break;
+/*
case RELOAD:
imsg_compose(ibuf, IMSG_CONF_RELOAD, 0, 0, -1, NULL, 0);
break;
+ */
case PAUSE_MDA:
imsg_compose(ibuf, IMSG_MDA_PAUSE, 0, 0, -1, NULL, 0);
break;
@@ -209,7 +211,7 @@ connected:
if (n == 0)
break;
switch(res->action) {
- case RELOAD:
+/* case RELOAD:*/
case SHUTDOWN:
case SCHEDULE:
case PAUSE_MDA: