diff options
author | Charles Longeau <chl@cvs.openbsd.org> | 2011-09-01 09:42:16 +0000 |
---|---|---|
committer | Charles Longeau <chl@cvs.openbsd.org> | 2011-09-01 09:42:16 +0000 |
commit | 5988fba4ce95e60f27b85ad8cff7130dc1e0ebfb (patch) | |
tree | 566faf47324f2250fb1df55d9c0ef33c7af1c225 /usr.sbin/smtpd/smtp_session.c | |
parent | c42cbe97e3f1108468a1226fb53d008f57f99263 (diff) |
- if no filter is setup, do not overwrite the data line with filtmsg buffer
- remove annoying debug lines
- disable back filters at smtpd.conf level
committing on behalf of gilles@
Diffstat (limited to 'usr.sbin/smtpd/smtp_session.c')
-rw-r--r-- | usr.sbin/smtpd/smtp_session.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c index 4673c0caf20..9832e218eb5 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.144 2011/08/31 18:56:30 gilles Exp $ */ +/* $OpenBSD: smtp_session.c,v 1.145 2011/09/01 09:42:15 chl Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -589,7 +589,6 @@ session_pickup(struct session *s, struct submit_status *ss) return; } - log_debug("state: %d", s->s_state); switch (s->s_state) { case S_INIT: s->s_state = S_GREETED; @@ -716,7 +715,6 @@ session_pickup(struct session *s, struct submit_status *ss) break; case S_DATACONTENT: - log_debug("line: %s\n", ss->u.dataline); if (ss->code != 250) s->s_msg.delivery.status |= DS_PERMFAILURE; session_read_data(s, ss->u.dataline); |