summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/smtp_session.c
diff options
context:
space:
mode:
authorJacek Masiulaniec <jacekm@cvs.openbsd.org>2009-04-09 19:49:35 +0000
committerJacek Masiulaniec <jacekm@cvs.openbsd.org>2009-04-09 19:49:35 +0000
commit2e2322d056b4c8ba1c9b7af6ee4f9dc822f05066 (patch)
tree56aa10d09172a90bab7e76383c705d9f65a9afd1 /usr.sbin/smtpd/smtp_session.c
parentfbfd94f72683cc3188d39266ff0dcff9eae8f3f6 (diff)
change syntax of the "listen on" and "relay via" directives:
1) kill the ssmtp keyword in "ssmtp listen on ..."; 2) kill the use keyword in "... use certificate foo"; 3) tls no longer implicit, user must explicitely use the tls or smtps option. 4) for "relay via", move the tls/smtps options to right after the port specification; makes it similar to "listen on". These directives: ssmtp listen on fxp0 use ceritifate "foo" accept for all relay via tls "mx.bar.com" now become: listen on fxp0 smtps certificate "foo" accept for all relay via "mx.bar.com" tls ok gilles@
Diffstat (limited to 'usr.sbin/smtpd/smtp_session.c')
-rw-r--r--usr.sbin/smtpd/smtp_session.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index 0e448304811..db558d366bd 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.63 2009/03/15 19:32:10 gilles Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.64 2009/04/09 19:49:34 jacekm Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -737,7 +737,7 @@ session_init(struct listener *l, struct session *s)
session_error, s)) == NULL)
fatalx("session_init: bufferevent_new failed");
- if (l->flags & F_SSMTP) {
+ if (l->flags & F_SMTPS) {
log_debug("session_init: initializing ssl");
s->s_flags |= F_EVLOCKED;
bufferevent_disable(s->s_bev, EV_READ|EV_WRITE);