diff options
| author | Marcus Alves Grando <mnag@FreeBSD.org> | 2008-03-24 20:27:42 +0000 |
|---|---|---|
| committer | Marcus Alves Grando <mnag@FreeBSD.org> | 2008-03-24 20:27:42 +0000 |
| commit | 47f4f0b4fcf48f6b966659053dba1627eacc6d41 (patch) | |
| tree | b9ff2c7888874dd41d45905601af3907ea86b4a6 /mail | |
| parent | 931071763276ff26e564b9f3028b11bfb0bc2c03 (diff) | |
- Fix milter macros (patch from Wietse Venema)
Notes
Notes:
svn path=/head/; revision=209722
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/postfix-current/Makefile | 2 | ||||
| -rw-r--r-- | mail/postfix-current/files/patch-src__smtpd__smtpd.c | 36 |
2 files changed, 37 insertions, 1 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index bfdad5d92c8e..ac7150be6db1 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -7,7 +7,7 @@ PORTNAME= postfix DISTVERSION= 2.6-20080221 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 4 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \ diff --git a/mail/postfix-current/files/patch-src__smtpd__smtpd.c b/mail/postfix-current/files/patch-src__smtpd__smtpd.c new file mode 100644 index 000000000000..f08cfea86de9 --- /dev/null +++ b/mail/postfix-current/files/patch-src__smtpd__smtpd.c @@ -0,0 +1,36 @@ +--- src/smtpd/smtpd.c.orig 2008-03-24 16:38:05.000000000 -0300 ++++ src/smtpd/smtpd.c 2008-03-24 16:48:38.000000000 -0300 +@@ -2108,14 +2108,14 @@ + if (smtpd_milters != 0 + && SMTPD_STAND_ALONE(state) == 0 + && (state->saved_flags & MILTER_SKIP_FLAGS) == 0) { ++ PUSH_STRING(saved_sender, state->sender, STR(state->addr_buf)); + err = milter_mail_event(smtpd_milters, + milter_argv(state, argc - 2, argv + 2)); + if (err != 0) { + /* Log reject etc. with correct sender information. */ +- PUSH_STRING(saved_sender, state->sender, STR(state->addr_buf)); + err = check_milter_reply(state, err); +- POP_STRING(saved_sender, state->sender); + } ++ POP_STRING(saved_sender, state->sender); + if (err != 0) { + /* XXX Reset access map side effects. */ + mail_reset(state); +@@ -2362,14 +2362,14 @@ + } + if (smtpd_milters != 0 + && (state->saved_flags & MILTER_SKIP_FLAGS) == 0) { ++ PUSH_STRING(saved_rcpt, state->recipient, STR(state->addr_buf)); + err = milter_rcpt_event(smtpd_milters, + milter_argv(state, argc - 2, argv + 2)); + if (err != 0) { + /* Log reject etc. with correct recipient information. */ +- PUSH_STRING(saved_rcpt, state->recipient, STR(state->addr_buf)); + err = check_milter_reply(state, err); +- POP_STRING(saved_rcpt, state->recipient); + } ++ POP_STRING(saved_rcpt, state->recipient); + if (err != 0) { + smtpd_chat_reply(state, "%s", err); + return (-1); |