diff options
| author |   CHTEKK <CHTEKK@localhost> | 2007-05-01 14:51:57 +0000 |
|---|---|---|
| committer | CHTEKK <CHTEKK@localhost> | 2007-05-01 14:51:57 +0000 |
| commit | d444fa8b7cc25cf45b7c339eeeed7d216c1e0eb6 (patch) | |
| tree | ab8509875814125abc7824537f4b264b630393d8 | |
| parent | Fix copy&paste error. (diff) | |
| download | chtekk-d444fa8b7cc25cf45b7c339eeeed7d216c1e0eb6.tar.gz chtekk-d444fa8b7cc25cf45b7c339eeeed7d216c1e0eb6.tar.bz2 chtekk-d444fa8b7cc25cf45b7c339eeeed7d216c1e0eb6.zip | |
Handle freeing of stuff better.
svn path=/; revision=50
| -rw-r--r-- | vda/postfix-2.4.1-vda-ng.patch | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/vda/postfix-2.4.1-vda-ng.patch b/vda/postfix-2.4.1-vda-ng.patch index 69a4c19..8fcfc49 100644 --- a/vda/postfix-2.4.1-vda-ng.patch +++ b/vda/postfix-2.4.1-vda-ng.patch @@ -345,7 +345,7 @@ diff -Nru postfix-2.4.1/src/virtual/mailbox.c postfix-2.4.1-vda/src/virtual/mail * Cleanup. diff -Nru postfix-2.4.1/src/virtual/maildir.c postfix-2.4.1-vda/src/virtual/maildir.c --- postfix-2.4.1/src/virtual/maildir.c 2006-06-26 14:59:19.000000000 +0200 -+++ postfix-2.4.1-vda/src/virtual/maildir.c 2007-05-01 16:24:21.000000000 +0200 ++++ postfix-2.4.1-vda/src/virtual/maildir.c 2007-05-01 16:50:25.000000000 +0200 @@ -63,28 +63,406 @@ #include <mbox_open.h> #include <dsn_util.h> @@ -499,7 +499,8 @@ diff -Nru postfix-2.4.1/src/virtual/maildir.c postfix-2.4.1-vda/src/virtual/mail + + return s; + } -+ + +-int deliver_maildir(LOCAL_STATE state, USER_ATTR usr_attr) + return 0; +} + @@ -639,8 +640,7 @@ diff -Nru postfix-2.4.1/src/virtual/maildir.c postfix-2.4.1-vda/src/virtual/mail + *str++ = *loc++; + + *str = 0; - --int deliver_maildir(LOCAL_STATE state, USER_ATTR usr_attr) ++ + return(ret); +} + @@ -706,7 +706,7 @@ diff -Nru postfix-2.4.1/src/virtual/maildir.c postfix-2.4.1-vda/src/virtual/mail + msg_info("%s: processing filter file: file_mtime=%ld", myname, retval); + } + -+ return(retval); ++ return retval; +} + +/* deliver_maildir - delivery to maildir-style mailbox */ @@ -1206,7 +1206,7 @@ diff -Nru postfix-2.4.1/src/virtual/maildir.c postfix-2.4.1-vda/src/virtual/mail } set_eugid(var_owner_uid, var_owner_gid); -@@ -223,31 +914,59 @@ +@@ -223,31 +914,60 @@ * location possibly under user control. */ if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) { @@ -1229,7 +1229,7 @@ diff -Nru postfix-2.4.1/src/virtual/maildir.c postfix-2.4.1-vda/src/virtual/mail - deliver_status = sent(BOUNCE_FLAGS(state.request), - SENT_ATTR(state.msg_attr)); + deliver_status = DEL_STAT_DEFER; - } ++ } + else if (mail_copy_status != 0) { + if (errno == EACCES) { + msg_warn("maildir access problem for UID/GID=%lu/%lu: %s", @@ -1264,7 +1264,7 @@ diff -Nru postfix-2.4.1/src/virtual/maildir.c postfix-2.4.1-vda/src/virtual/mail + deliver_status = + (STR(why->status)[0] == '4' ? defer_append : bounce_append) + (BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr)); -+ } + } + else { + dsb_simple(why, "2.0.0", "delivered to maildir"); + deliver_status = sent(BOUNCE_FLAGS(state.request), SENT_ATTR(state.msg_attr)); @@ -1282,7 +1282,8 @@ diff -Nru postfix-2.4.1/src/virtual/maildir.c postfix-2.4.1-vda/src/virtual/mail if (newfile) - myfree(newfile); + myfree(newfile); -+ ++ if (bkpnewfile) ++ myfree(bkpnewfile); return (deliver_status); } diff -Nru postfix-2.4.1/src/virtual/virtual.c postfix-2.4.1-vda/src/virtual/virtual.c |