diff options
| author | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2009-04-09 19:49:35 +0000 |
|---|---|---|
| committer | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2009-04-09 19:49:35 +0000 |
| commit | 2e2322d056b4c8ba1c9b7af6ee4f9dc822f05066 (patch) | |
| tree | 56aa10d09172a90bab7e76383c705d9f65a9afd1 /usr.sbin/smtpd/ssl.c | |
| parent | fbfd94f72683cc3188d39266ff0dcff9eae8f3f6 (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/ssl.c')
| -rw-r--r-- | usr.sbin/smtpd/ssl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/ssl.c b/usr.sbin/smtpd/ssl.c index f151a94af75..29f1aff2d2c 100644 --- a/usr.sbin/smtpd/ssl.c +++ b/usr.sbin/smtpd/ssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.c,v 1.11 2009/03/15 19:32:11 gilles Exp $ */ +/* $OpenBSD: ssl.c,v 1.12 2009/04/09 19:49:34 jacekm Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -509,7 +509,7 @@ ssl_session_accept(int fd, short event, void *p) log_info("ssl_session_accept: accepted ssl client"); s->s_flags |= F_SECURE; - if (s->s_l->flags & F_SSMTP) { + if (s->s_l->flags & F_SMTPS) { s_smtp.ssmtp++; s_smtp.ssmtp_active++; } @@ -601,7 +601,7 @@ ssl_session_destroy(struct session *s) return; } - if (s->s_l->flags & F_SSMTP) { + if (s->s_l->flags & F_SMTPS) { if (s->s_flags & F_SECURE) s_smtp.ssmtp_active--; } |