diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2011-10-26 20:47:32 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2011-10-26 20:47:32 +0000 |
| commit | 847b44dca768ec9f28b465579b1772bc5e61e1dd (patch) | |
| tree | 23aee58ba4d82d99cba9301ad28fecb8f8016ad6 /usr.sbin/smtpd/control.c | |
| parent | e9500afcb6cfeba1014e881a1b7be22a505ae3a8 (diff) | |
- fix smtpctl pause/resume so the ramqueue scheduling is done correctly
- rename IMSG and smtpctl pause/resume parameters
- update man page
tested by me, ok chl@, eric@
Diffstat (limited to 'usr.sbin/smtpd/control.c')
| -rw-r--r-- | usr.sbin/smtpd/control.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/smtpd/control.c b/usr.sbin/smtpd/control.c index 9dd53fe9721..efa95132f87 100644 --- a/usr.sbin/smtpd/control.c +++ b/usr.sbin/smtpd/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.61 2011/10/09 18:39:53 eric Exp $ */ +/* $OpenBSD: control.c,v 1.62 2011/10/26 20:47:31 gilles Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -398,7 +398,7 @@ control_dispatch_ext(int fd, short event, void *arg) imsg_compose_event(&c->iev, IMSG_CTL_OK, 0, 0, -1, NULL, 0); break; } - case IMSG_QUEUE_PAUSE_LOCAL: + case IMSG_QUEUE_PAUSE_MDA: if (euid) goto badcred; @@ -409,10 +409,10 @@ control_dispatch_ext(int fd, short event, void *arg) } env->sc_flags |= SMTPD_MDA_PAUSED; imsg_compose_event(env->sc_ievs[PROC_QUEUE], - IMSG_QUEUE_PAUSE_LOCAL, 0, 0, -1, NULL, 0); + IMSG_QUEUE_PAUSE_MDA, 0, 0, -1, NULL, 0); imsg_compose_event(&c->iev, IMSG_CTL_OK, 0, 0, -1, NULL, 0); break; - case IMSG_QUEUE_PAUSE_OUTGOING: + case IMSG_QUEUE_PAUSE_MTA: if (euid) goto badcred; @@ -423,7 +423,7 @@ control_dispatch_ext(int fd, short event, void *arg) } env->sc_flags |= SMTPD_MTA_PAUSED; imsg_compose_event(env->sc_ievs[PROC_QUEUE], - IMSG_QUEUE_PAUSE_OUTGOING, 0, 0, -1, NULL, 0); + IMSG_QUEUE_PAUSE_MTA, 0, 0, -1, NULL, 0); imsg_compose_event(&c->iev, IMSG_CTL_OK, 0, 0, -1, NULL, 0); break; case IMSG_SMTP_PAUSE: @@ -440,7 +440,7 @@ control_dispatch_ext(int fd, short event, void *arg) 0, 0, -1, NULL, 0); imsg_compose_event(&c->iev, IMSG_CTL_OK, 0, 0, -1, NULL, 0); break; - case IMSG_QUEUE_RESUME_LOCAL: + case IMSG_QUEUE_RESUME_MDA: if (euid) goto badcred; @@ -451,10 +451,10 @@ control_dispatch_ext(int fd, short event, void *arg) } env->sc_flags &= ~SMTPD_MDA_PAUSED; imsg_compose_event(env->sc_ievs[PROC_QUEUE], - IMSG_QUEUE_RESUME_LOCAL, 0, 0, -1, NULL, 0); + IMSG_QUEUE_RESUME_MDA, 0, 0, -1, NULL, 0); imsg_compose_event(&c->iev, IMSG_CTL_OK, 0, 0, -1, NULL, 0); break; - case IMSG_QUEUE_RESUME_OUTGOING: + case IMSG_QUEUE_RESUME_MTA: if (euid) goto badcred; @@ -465,7 +465,7 @@ control_dispatch_ext(int fd, short event, void *arg) } env->sc_flags &= ~SMTPD_MTA_PAUSED; imsg_compose_event(env->sc_ievs[PROC_QUEUE], - IMSG_QUEUE_RESUME_OUTGOING, 0, 0, -1, NULL, 0); + IMSG_QUEUE_RESUME_MTA, 0, 0, -1, NULL, 0); imsg_compose_event(&c->iev, IMSG_CTL_OK, 0, 0, -1, NULL, 0); break; |