diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2014-02-10 09:28:06 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2014-02-10 09:28:06 +0000 |
| commit | d3bbfd4a2843b5ab42128304b812297cd72c19ef (patch) | |
| tree | 66478de9b5356390b5bb70c0de5f41e3df5d329d | |
| parent | 75f8a2e5a773cdcca333f0743b84ac4145b9fb70 (diff) | |
tweak usage() and bump version.
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 12 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index 38575be7022..cbe8aca73e6 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.c,v 1.211 2014/02/04 15:22:39 eric Exp $ */ +/* $OpenBSD: smtpd.c,v 1.212 2014/02/10 09:28:05 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -294,8 +294,8 @@ usage(void) { extern char *__progname; - fprintf(stderr, "usage: %s [-dnv] [-D macro=value] " - "[-f file] [-P system]\n", __progname); + fprintf(stderr, "usage: %s [-dhnv] [-D macro=value] " + "[-f file] [-P system] [-T trace]\n", __progname); exit(1); } @@ -487,7 +487,7 @@ main(int argc, char *argv[]) TAILQ_INIT(&offline_q); - while ((c = getopt(argc, argv, "B:dD:nP:f:T:v")) != -1) { + while ((c = getopt(argc, argv, "B:dD:hnP:f:T:v")) != -1) { switch (c) { case 'B': if (strstr(optarg, "queue=") == optarg) @@ -510,6 +510,10 @@ main(int argc, char *argv[]) "could not parse macro definition %s", optarg); break; + case 'h': + log_info("version: OpenSMTPD " SMTPD_VERSION); + usage(); + break; case 'n': debug = 2; opts |= SMTPD_OPT_NOACTION; diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 70f39a3ff41..cb5d43aa559 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.448 2014/02/04 15:44:06 eric Exp $ */ +/* $OpenBSD: smtpd.h,v 1.449 2014/02/10 09:28:05 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -45,7 +45,7 @@ #ifndef SMTPD_NAME #define SMTPD_NAME "OpenSMTPD" #endif -#define SMTPD_VERSION "5.4.1" +#define SMTPD_VERSION "5.4.2" #define SMTPD_BANNER "220 %s ESMTP %s" #define SMTPD_SESSION_TIMEOUT 300 #define SMTPD_BACKLOG 5 |