summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/smtp_session.c
diff options
context:
space:
mode:
authorJacek Masiulaniec <jacekm@cvs.openbsd.org>2008-12-21 19:27:58 +0000
committerJacek Masiulaniec <jacekm@cvs.openbsd.org>2008-12-21 19:27:58 +0000
commitee5179aeb4781dd03c2c9b2ad68ae72b119a6f17 (patch)
treef459fac0f3a4523b0170d7b66d583d8d4a1e18c5 /usr.sbin/smtpd/smtp_session.c
parent86d47a7a11efb924a028dbc7b6c3fcecc3686fd7 (diff)
fix session flags resetting; ok gilles@
Diffstat (limited to 'usr.sbin/smtpd/smtp_session.c')
-rw-r--r--usr.sbin/smtpd/smtp_session.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index 2a4080b6c27..fdb3be64e22 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.34 2008/12/21 18:51:08 gilles Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.35 2008/12/21 19:27:57 jacekm Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -304,8 +304,7 @@ session_rfc5321_helo_handler(struct session *s, char *args)
}
s->s_state = S_HELO;
- if (s->s_flags & F_SECURE)
- s->s_flags = F_SECURE;
+ s->s_flags &= F_SECURE;
if (s->s_ss.ss_family == PF_INET) {
struct sockaddr_in *ssin = (struct sockaddr_in *)&s->s_ss;
@@ -344,8 +343,7 @@ session_rfc5321_ehlo_handler(struct session *s, char *args)
}
s->s_state = S_HELO;
- if (s->s_flags & F_SECURE)
- s->s_flags = F_SECURE;
+ s->s_flags &= F_SECURE;
s->s_flags |= F_EHLO;
s->s_flags |= F_8BITMIME;