summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd
diff options
context:
space:
mode:
authorEric Faurot <eric@cvs.openbsd.org>2014-04-09 12:47:24 +0000
committerEric Faurot <eric@cvs.openbsd.org>2014-04-09 12:47:24 +0000
commite97ef1713955e6e750141695a02cf5bc04ca5b3b (patch)
tree0aa6aeecad10924502be051b099ef1e656e6f909 /usr.sbin/smtpd
parent13a9a69ea07082ac41637f136d4bea344235bcb0 (diff)
remove useless define for banner
ok gilles@
Diffstat (limited to 'usr.sbin/smtpd')
-rw-r--r--usr.sbin/smtpd/smtp_session.c4
-rw-r--r--usr.sbin/smtpd/smtpd.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index a0c85cce723..199460f0554 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.198 2014/04/04 16:10:42 eric Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.199 2014/04/09 12:47:23 eric Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -1562,7 +1562,7 @@ smtp_connected(struct smtp_session *s)
static void
smtp_send_banner(struct smtp_session *s)
{
- smtp_reply(s, SMTPD_BANNER, s->smtpname, SMTPD_NAME);
+ smtp_reply(s, "220 %s ESMTP %s", s->smtpname, SMTPD_NAME);
io_reload(&s->io);
}
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index bd453e141ea..dfdf1f68755 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.h,v 1.452 2014/04/04 16:10:42 eric Exp $ */
+/* $OpenBSD: smtpd.h,v 1.453 2014/04/09 12:47:23 eric Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -46,7 +46,6 @@
#define SMTPD_NAME "OpenSMTPD"
#endif
#define SMTPD_VERSION "5.4.3"
-#define SMTPD_BANNER "220 %s ESMTP %s"
#define SMTPD_SESSION_TIMEOUT 300
#define SMTPD_BACKLOG 5