diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-01-04 22:35:10 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-01-04 22:35:10 +0000 |
| commit | 92102d1d1b05d500457859fe5b0485fe1cc7868d (patch) | |
| tree | 4f0652b091967145b5dea3f5d59b57a3992511df /usr.sbin/smtpd/smtpctl.c | |
| parent | 79dc2898a960528ca8c456fd9ef71358ff4debfe (diff) | |
- smtp can now pause/resume the accepting of incoming messages
- smtpctl recognizes "pause incoming" and "resume incoming"
- setup imsg communication between control process and smtp process
Diffstat (limited to 'usr.sbin/smtpd/smtpctl.c')
| -rw-r--r-- | usr.sbin/smtpd/smtpctl.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c index 51a3c2c586e..534a3fe8235 100644 --- a/usr.sbin/smtpd/smtpctl.c +++ b/usr.sbin/smtpd/smtpctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpctl.c,v 1.4 2009/01/04 19:37:41 gilles Exp $ */ +/* $OpenBSD: smtpctl.c,v 1.5 2009/01/04 22:35:09 gilles Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -139,16 +139,22 @@ connected: imsg_compose(ibuf, IMSG_CONF_RELOAD, 0, 0, -1, NULL, 0); break; case PAUSE_MDA: - imsg_compose(ibuf, IMSG_RUNNER_PAUSE_MDA, 0, 0, -1, NULL, 0); + imsg_compose(ibuf, IMSG_MDA_PAUSE, 0, 0, -1, NULL, 0); break; case PAUSE_MTA: - imsg_compose(ibuf, IMSG_RUNNER_PAUSE_MTA, 0, 0, -1, NULL, 0); + imsg_compose(ibuf, IMSG_MTA_PAUSE, 0, 0, -1, NULL, 0); + break; + case PAUSE_SMTP: + imsg_compose(ibuf, IMSG_SMTP_PAUSE, 0, 0, -1, NULL, 0); break; case RESUME_MDA: - imsg_compose(ibuf, IMSG_RUNNER_RESUME_MDA, 0, 0, -1, NULL, 0); + imsg_compose(ibuf, IMSG_MDA_RESUME, 0, 0, -1, NULL, 0); break; case RESUME_MTA: - imsg_compose(ibuf, IMSG_RUNNER_RESUME_MTA, 0, 0, -1, NULL, 0); + imsg_compose(ibuf, IMSG_MDA_RESUME, 0, 0, -1, NULL, 0); + break; + case RESUME_SMTP: + imsg_compose(ibuf, IMSG_SMTP_RESUME, 0, 0, -1, NULL, 0); break; case MONITOR: /* XXX */ @@ -177,8 +183,10 @@ connected: case SHUTDOWN: case PAUSE_MDA: case PAUSE_MTA: + case PAUSE_SMTP: case RESUME_MDA: case RESUME_MTA: + case RESUME_SMTP: done = show_command_output(&imsg); break; case NONE: |