diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2013-02-14 12:30:50 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2013-02-14 12:30:50 +0000 |
| commit | 1a6a21621e7562e608266ee3de8b00c653188db6 (patch) | |
| tree | b7115ca1b677fda2afbd0d3252065b5eb09bbd17 /usr.sbin/smtpd/smtpctl.c | |
| parent | 7d1f8d4c696c5ea8e871bf219c3feea11f3f3abc (diff) | |
- smtpctl trace expand, enables tracing of aliases expansion
- replace "users" keyword with "userbase" when providing alternate userbase
- disambiguise expansion nodes when expanding across domains and userbases
- allow use of '=' instead of '=>' when declaring a mapping
ok eric@
Diffstat (limited to 'usr.sbin/smtpd/smtpctl.c')
| -rw-r--r-- | usr.sbin/smtpd/smtpctl.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c index cc218ee9155..43c82372509 100644 --- a/usr.sbin/smtpd/smtpctl.c +++ b/usr.sbin/smtpd/smtpctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpctl.c,v 1.100 2013/01/28 11:09:53 gilles Exp $ */ +/* $OpenBSD: smtpctl.c,v 1.101 2013/02/14 12:30:49 gilles Exp $ */ /* * Copyright (c) 2006 Gilles Chehade <gilles@poolp.org> @@ -310,6 +310,7 @@ main(int argc, char *argv[]) case LOG_TRACE_STAT: case LOG_TRACE_RULES: case LOG_TRACE_IMSG_SIZE: + case LOG_TRACE_EXPAND: case LOG_TRACE_ALL: verb = trace_convert(action); imsg_compose(ibuf, IMSG_CTL_TRACE, 0, 0, -1, &verb, @@ -328,6 +329,7 @@ main(int argc, char *argv[]) case LOG_UNTRACE_STAT: case LOG_UNTRACE_RULES: case LOG_UNTRACE_IMSG_SIZE: + case LOG_UNTRACE_EXPAND: case LOG_UNTRACE_ALL: verb = trace_convert(action); imsg_compose(ibuf, IMSG_CTL_UNTRACE, 0, 0, -1, &verb, @@ -382,6 +384,7 @@ main(int argc, char *argv[]) case LOG_TRACE_STAT: case LOG_TRACE_RULES: case LOG_TRACE_IMSG_SIZE: + case LOG_TRACE_EXPAND: case LOG_TRACE_ALL: case LOG_UNTRACE_IMSG: case LOG_UNTRACE_IO: @@ -394,6 +397,7 @@ main(int argc, char *argv[]) case LOG_UNTRACE_STAT: case LOG_UNTRACE_RULES: case LOG_UNTRACE_IMSG_SIZE: + case LOG_UNTRACE_EXPAND: case LOG_UNTRACE_ALL: case LOG_PROFILE_IMSG: case LOG_PROFILE_QUEUE: @@ -866,6 +870,10 @@ trace_convert(uint32_t trace) case LOG_UNTRACE_IMSG_SIZE: return TRACE_IMSGSIZE; + case LOG_TRACE_EXPAND: + case LOG_UNTRACE_EXPAND: + return TRACE_EXPAND; + case LOG_TRACE_ALL: case LOG_UNTRACE_ALL: return ~TRACE_VERBOSE; |