Delete Postfix 2.4.1 patch, please use Postfix 2.4.3 now.

BUGFIX: Now also for maildirs, if no limit is set, the default virtual_mailbox_limit is used.

svn path=/; revision=61

2 files changed, 18 insertions, 13 deletions

diff --git a/vda/postfix-2.4.1-vda-ng-r1.patch.gz b/vda/postfix-2.4.1-vda-ng-r1.patch.gz
deleted file mode 100644
index a7739d4..0000000
--- a/vda/postfix-2.4.1-vda-ng-r1.patch.gz
+++ /dev/null
diff --git a/vda/postfix-2.4.3-vda-ng.patch b/vda/postfix-2.4.3-vda-ng.patch
index 1d81d68..d834705 100644
--- a/vda/postfix-2.4.3-vda-ng.patch
+++ b/vda/postfix-2.4.3-vda-ng.patch
@@ -175,8 +175,8 @@ diff -Nru postfix-2.4.1/src/util/file_limit.c postfix-2.4.1-vda/src/util/file_li
  #ifdef SIGXFSZ
 diff -Nru postfix-2.4.1/src/virtual/mailbox.c postfix-2.4.1-vda/src/virtual/mailbox.c
 --- postfix-2.4.1/src/virtual/mailbox.c	2006-06-26 14:59:19.000000000 +0200
-+++ postfix-2.4.1-vda/src/virtual/mailbox.c	2007-05-01 12:52:50.000000000 +0200
-@@ -70,6 +70,58 @@
++++ postfix-2.4.1-vda/src/virtual/mailbox.c	2007-07-29 14:29:30.000000000 +0200
+@@ -70,6 +70,60 @@
  #define YES	1
  #define NO	0
  
@@ -220,11 +220,13 @@ diff -Nru postfix-2.4.1/src/virtual/mailbox.c postfix-2.4.1-vda/src/virtual/mail
 +            }
 +        }
 +        else {
++            /* Invalid limit size (negative), or zero. Use default virtual_mailbox_limit. */
 +            set_file_limit(var_virt_mailbox_limit);
 +            status = NO;
 +        }
 +    }
 +    else {
++        /* There is no limit in the maps. Use default virtual_mailbox_limit. */
 +        set_file_limit(var_virt_mailbox_limit);
 +        status = NO;
 +    }
@@ -235,7 +237,7 @@ diff -Nru postfix-2.4.1/src/virtual/mailbox.c postfix-2.4.1-vda/src/virtual/mail
  /* deliver_mailbox_file - deliver to recipient mailbox */
  
  static int deliver_mailbox_file(LOCAL_STATE state, USER_ATTR usr_attr)
-@@ -207,62 +259,72 @@
+@@ -207,62 +261,72 @@
       * Look up the mailbox owner rights. Defer in case of trouble.
       */
      uid_res = mail_addr_find(virtual_uid_maps, state.msg_attr.user,
@@ -345,7 +347,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:53:26.000000000 +0200
++++ postfix-2.4.1-vda/src/virtual/maildir.c	2007-07-29 14:29:37.000000000 +0200
 @@ -63,28 +63,406 @@
  #include <mbox_open.h>
  #include <dsn_util.h>
@@ -784,7 +786,7 @@ diff -Nru postfix-2.4.1/src/virtual/maildir.c postfix-2.4.1-vda/src/virtual/mail
      }
  
      /*
-@@ -109,17 +486,81 @@
+@@ -109,17 +486,84 @@
       * attribute to reflect the final recipient.
       */
      if (vstream_fseek(state.msg_attr.fp, state.msg_attr.offset, SEEK_SET) < 0)
@@ -819,8 +821,11 @@ diff -Nru postfix-2.4.1/src/virtual/maildir.c postfix-2.4.1-vda/src/virtual/mail
 +    }
 +
 +    /*
-+     * Find the Maildir limit in the maps. Fall back to virtual_mailbox_limit in
-+     * case limit is smaller than message_size_limit.
++     * Look up the virtual maildir limit size for this user. Fall back to virtual_mailbox_limit in
++     * case lookup failed. If virtual maildir limit size is 0 or less, fall back to virtual_mailbox_limit.
++     * If it's more than 0 (positive int), check if the value is smaller than the maximum message size,
++     * if it is and the virtual maildir limit can't be overridden, fall back to virtual_mailbox_limit and
++     * warn the user, else use the value directly as the maildir limit.
 +     */
 +    if (*var_virt_mailbox_limit_maps != 0 && (limit_res = mail_addr_find(virtual_mailbox_limit_maps, state.msg_attr.user, (char **) NULL)) != 0) {
 +        n = atol(limit_res);
@@ -843,13 +848,13 @@ diff -Nru postfix-2.4.1/src/virtual/maildir.c postfix-2.4.1-vda/src/virtual/mail
 +            }
 +        }
 +        else {
-+            /* Invalid limit size (negative), or zero. Set n to 0. */
-+            n = 0;
++            /* Invalid limit size (negative), or zero. Use default virtual_mailbox_limit. */
++            n = var_virt_mailbox_limit;
 +        }
 +    }
 +    else {
-+        /* There is no limit in the maps. Set n to 0. */
-+        n = 0;
++        /* There is no limit in the maps. Use default virtual_mailbox_limit. */
++        n = var_virt_mailbox_limit;
 +    }
 +
 +    /*
@@ -872,7 +877,7 @@ diff -Nru postfix-2.4.1/src/virtual/maildir.c postfix-2.4.1-vda/src/virtual/mail
  
      /*
       * Create and write the file as the recipient, so that file quota work.
-@@ -174,46 +615,296 @@
+@@ -174,46 +618,296 @@
       * [...]
       */
      set_eugid(usr_attr.uid, usr_attr.gid);
@@ -1206,7 +1211,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,64 @@
+@@ -223,31 +917,64 @@
       * location possibly under user control.
       */
      if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) {