diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-05-13 09:18:53 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-05-13 09:18:53 +0000 |
| commit | 69a57ff8f5001fcc735bbe7897782b2929e33e8d (patch) | |
| tree | 10cabfbdab3981b0894e3104d46ced0513ec8e16 /usr.sbin | |
| parent | f939b758f1c469a3c6f7305fc788c5ffc29dbffe (diff) | |
Remove sizes entry so it doesn't appear as a valid command in the
"smtpctl show" output, and use errx rather than err for the unknown
message error.
ok gilles
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/smtpd/parser.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpctl.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/parser.c b/usr.sbin/smtpd/parser.c index ba978925630..7bb6fa97c4e 100644 --- a/usr.sbin/smtpd/parser.c +++ b/usr.sbin/smtpd/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.24 2012/01/12 18:06:18 eric Exp $ */ +/* $OpenBSD: parser.c,v 1.25 2012/05/13 09:18:52 nicm Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -82,7 +82,6 @@ static const struct token t_show[] = { {KEYWORD, "queue", SHOW_QUEUE, NULL}, {KEYWORD, "runqueue", SHOW_RUNQUEUE, NULL}, {KEYWORD, "stats", SHOW_STATS, NULL}, - {KEYWORD, "sizes", SHOW_SIZES, NULL}, {ENDTOKEN, "", NONE, NULL} }; diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c index 619820e54a7..de9d0653a5e 100644 --- a/usr.sbin/smtpd/smtpctl.c +++ b/usr.sbin/smtpd/smtpctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpctl.c,v 1.79 2012/04/15 12:12:35 chl Exp $ */ +/* $OpenBSD: smtpctl.c,v 1.80 2012/05/13 09:18:52 nicm Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -228,7 +228,7 @@ connected: done = 1; break; default: - err(1, "unknown request (%d)", res->action); + errx(1, "unknown request (%d)", res->action); } while (ibuf->w.queued) |