summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorJacek Masiulaniec <jacekm@cvs.openbsd.org>2009-09-17 23:51:24 +0000
committerJacek Masiulaniec <jacekm@cvs.openbsd.org>2009-09-17 23:51:24 +0000
commit6aba0d497852b4ecab7923961fe0e3e820165942 (patch)
treeb59ce567a067baf0ffee26d6573aeb9edd0ba45e /usr.sbin
parentc45ea103abd216222180899fb3eeb93680369318 (diff)
The client API is meant to require STARTTLS by default, a behaviour which
can be altered using client_ssl_optional(). Reported by Michael Lechtermann <michael@lechtermann.net>
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/smtpd/client.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/client.c b/usr.sbin/smtpd/client.c
index 322d441daaf..034c01c16f5 100644
--- a/usr.sbin/smtpd/client.c
+++ b/usr.sbin/smtpd/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.3 2009/09/15 16:50:06 jacekm Exp $ */
+/* $OpenBSD: client.c,v 1.4 2009/09/17 23:51:23 jacekm Exp $ */
/*
* Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -78,8 +78,8 @@ client_init(int fd, char *ehlo)
TAILQ_INIT(&sp->recipients);
#ifndef CLIENT_NO_SSL
- sp->exts[CLIENT_EXT_STARTTLS].want = 0;
- sp->exts[CLIENT_EXT_STARTTLS].must = 0;
+ sp->exts[CLIENT_EXT_STARTTLS].want = 1;
+ sp->exts[CLIENT_EXT_STARTTLS].must = 1;
sp->exts[CLIENT_EXT_STARTTLS].state = CLIENT_STARTTLS;
#endif