diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2012-01-29 16:51:01 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2012-01-29 16:51:01 +0000 |
| commit | f7e581dab282656387f03a9581d50ab393bf8dee (patch) | |
| tree | 9eef8328a74fb7df1236b176b43c0e3da7b1521c /usr.sbin/smtpd | |
| parent | 59bc2ee4ee198651031ee9b5376b4a273ca57f15 (diff) | |
For some reason, all recipients are rejected if the msg field is not
initialized here. Fix it, but this requires further investigation.
ok gilles@
Diffstat (limited to 'usr.sbin/smtpd')
| -rw-r--r-- | usr.sbin/smtpd/smtp_session.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c index c6cbab3f724..92b3087663e 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.160 2012/01/29 15:33:08 eric Exp $ */ +/* $OpenBSD: smtp_session.c,v 1.161 2012/01/29 16:51:00 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -700,6 +700,8 @@ session_pickup(struct session *s, struct submit_status *ss) case S_CONNECTED: session_enter_state(s, S_INIT); s->s_state = S_INIT; + s->s_msg.session_id = s->s_id; + s->s_msg.ss = s->s_ss; if (s->s_l->flags & F_SMTPS) { ssl_session_init(s); io_set_read(&s->s_io); @@ -707,8 +709,6 @@ session_pickup(struct session *s, struct submit_status *ss) return; } #if 0 - s->s_msg.session_id = s->s_id; - s->s_msg.ss = s->s_ss; session_imsg(s, PROC_MFA, IMSG_MFA_CONNECT, 0, 0, -1, &s->s_msg, sizeof(s->s_msg)); break; |