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/parse.y | |
| 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/parse.y')
| -rw-r--r-- | usr.sbin/smtpd/parse.y | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y index 0207ea89b92..cbd3cb9056d 100644 --- a/usr.sbin/smtpd/parse.y +++ b/usr.sbin/smtpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.78 2011/08/31 18:56:30 gilles Exp $ */ +/* $OpenBSD: parse.y,v 1.79 2011/09/01 09:42:15 chl Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -379,7 +379,7 @@ main : QUEUE INTERVAL interval { YYERROR; } free($2); - } + }/* | FILTER STRING STRING { struct filter *filter; struct filter *tmp; @@ -411,6 +411,7 @@ main : QUEUE INTERVAL interval { free($2); free($3); } + */ ; maptype : SINGLE { map->m_type = T_SINGLE; } |