diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2008-11-25 15:55:14 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2008-11-25 15:55:14 +0000 |
| commit | 934654fbb8cbce221ed76dfde5e13954dd3dd960 (patch) | |
| tree | 7da639bbc37b03d7acd8a4917f2b78e15684a5e6 /usr.sbin | |
| parent | 7c5970b40646af097446ecad1a36f2def9599857 (diff) | |
- F_IMSG_SENT is no longer used, kill
suggested by Jacek Masiulaniec <jacekm@dobremiasto.net>
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/smtpd/smtp_session.c | 5 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c index 6d1922ab602..ff9a3223f7e 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.10 2008/11/24 23:55:25 gilles Exp $ */ +/* $OpenBSD: smtp_session.c,v 1.11 2008/11/25 15:55:13 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -357,7 +357,6 @@ session_rfc5321_mail_handler(struct session *s, char *args) s->s_msg.rcptcount = 0; s->s_state = S_MAILREQUEST; - s->s_flags |= F_IMSG_SENT; s->s_msg.id = s->s_id; s->s_msg.session_id = s->s_id; s->s_msg.session_ss = s->s_ss; @@ -406,7 +405,6 @@ session_rfc5321_rcpt_handler(struct session *s, char *args) mr.id = s->s_msg.id; s->s_state = S_RCPTREQUEST; - s->s_flags |= F_IMSG_SENT; mr.ss = s->s_ss; imsg_compose(s->s_env->sc_ibufs[PROC_MFA], IMSG_MFA_RCPT_SUBMIT, @@ -709,7 +707,6 @@ session_read(struct bufferevent *bev, void *p) read: s->s_tm = time(NULL); - s->s_flags &= ~F_IMSG_SENT; line = evbuffer_readline(bev->input); if (line == NULL) { bufferevent_disable(s->s_bev, EV_READ); diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 7cfc6e32748..6ed1410d6a8 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.11 2008/11/17 21:50:43 gilles Exp $ */ +/* $OpenBSD: smtpd.h,v 1.12 2008/11/25 15:55:13 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -565,10 +565,9 @@ struct session_auth_reply { enum session_flags { F_EHLO = 0x1, F_QUIT = 0x2, - F_IMSG_SENT = 0x4, - F_8BITMIME = 0x8, - F_SECURE = 0x10, - F_AUTHENTICATED = 0x20 + F_8BITMIME = 0x4, + F_SECURE = 0x8, + F_AUTHENTICATED = 0x10 }; struct session { |