summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Jung <jung@cvs.openbsd.org>2016-02-05 19:15:16 +0000
committerJoerg Jung <jung@cvs.openbsd.org>2016-02-05 19:15:16 +0000
commit76ac34e20f3878af92e0d08827638167d9af5dca (patch)
tree6fa63afdabfc97717b88ee9b575d1f45b01557b9
parentd1ae35b486f00dc8b5c83c9f9ad2760e1e1e7e4c (diff)
use SMTPD_NAME define
ok gilles
-rw-r--r--usr.sbin/smtpd/smtp_session.c4
-rw-r--r--usr.sbin/smtpd/smtpd.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index 045849f8718..88c912a21d3 100644
--- a/usr.sbin/smtpd/smtp_session.c
+++ b/usr.sbin/smtpd/smtp_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtp_session.c,v 1.267 2016/02/04 20:27:33 eric Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.268 2016/02/05 19:15:15 jung Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -1772,7 +1772,7 @@ smtp_command(struct smtp_session *s, char *line)
break;
case CMD_HELP:
- smtp_reply(s, "214- This is OpenSMTPD");
+ smtp_reply(s, "214- This is " SMTPD_NAME);
smtp_reply(s, "214- To report bugs in the implementation, "
"please contact bugs@openbsd.org");
smtp_reply(s, "214- with full details");
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index fba23f1fd0b..23c08aa8875 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.c,v 1.273 2016/02/02 17:51:11 sthen Exp $ */
+/* $OpenBSD: smtpd.c,v 1.274 2016/02/05 19:15:15 jung Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -484,7 +484,7 @@ main(int argc, char *argv[])
optarg);
break;
case 'h':
- log_info("version: OpenSMTPD " SMTPD_VERSION);
+ log_info("version: " SMTPD_NAME " " SMTPD_VERSION);
usage();
break;
case 'n':