summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreric <eric@openbsd.org>2013-07-19 21:58:54 +0000
committereric <eric@openbsd.org>2013-07-19 21:58:54 +0000
commitdf2a7d50c8a3b9e7cbb55616af9ebc95d2a0614b (patch)
tree6d8f38c833595bfdfe21d39d4cd40683af27a322
parentImplement a scheduler_proc backend (diff)
downloadwireguard-openbsd-df2a7d50c8a3b9e7cbb55616af9ebc95d2a0614b.tar.xz
wireguard-openbsd-df2a7d50c8a3b9e7cbb55616af9ebc95d2a0614b.zip
Temporarily allow alternate names for traces, until this get cleaned up.
-rw-r--r--usr.sbin/smtpd/smtpd.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index 71c96517381..94d40fb919c 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.c,v 1.197 2013/07/19 21:14:52 eric Exp $ */
+/* $OpenBSD: smtpd.c,v 1.198 2013/07/19 21:58:54 eric Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -638,17 +638,22 @@ main(int argc, char *argv[])
verbose |= TRACE_IO;
else if (!strcmp(optarg, "smtp"))
verbose |= TRACE_SMTP;
- else if (!strcmp(optarg, "mfa"))
+ else if (!strcmp(optarg, "mfa") ||
+ !strcmp(optarg, "filter") ||
+ !strcmp(optarg, "filters"))
verbose |= TRACE_MFA;
- else if (!strcmp(optarg, "mta"))
+ else if (!strcmp(optarg, "mta") ||
+ !strcmp(optarg, "transfer"))
verbose |= TRACE_MTA;
- else if (!strcmp(optarg, "bounce"))
+ else if (!strcmp(optarg, "bounce") ||
+ !strcmp(optarg, "bounces"))
verbose |= TRACE_BOUNCE;
else if (!strcmp(optarg, "scheduler"))
verbose |= TRACE_SCHEDULER;
else if (!strcmp(optarg, "lookup"))
verbose |= TRACE_LOOKUP;
- else if (!strcmp(optarg, "stat"))
+ else if (!strcmp(optarg, "stat") ||
+ !strcmp(optarg, "stats"))
verbose |= TRACE_STAT;
else if (!strcmp(optarg, "rules"))
verbose |= TRACE_RULES;
@@ -656,7 +661,8 @@ main(int argc, char *argv[])
verbose |= TRACE_MPROC;
else if (!strcmp(optarg, "expand"))
verbose |= TRACE_EXPAND;
- else if (!strcmp(optarg, "tables"))
+ else if (!strcmp(optarg, "table") ||
+ !strcmp(optarg, "tables"))
verbose |= TRACE_TABLES;
else if (!strcmp(optarg, "queue"))
verbose |= TRACE_QUEUE;