[SVN] r641 - in /branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian: changelog patches/00list patches/81-cyr_expire-remote-mailboxes.dpath

[debian at incase.de]

Author: farzy
Date: Tue Oct  3 17:28:54 2006
New Revision: 641

URL: https://mail.incase.de/viewcvs?rev=641&root=cyrus22&view=rev
Log:
cyr_expire should not try to scan remote mailboxes. Applied patch from upstream bug
report 2884.

Added:
    branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/81-cyr_expire-remote-mailboxes.dpath   (with props)
Modified:
    branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/changelog
    branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/00list

Modified: branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/changelog?rev=641&root=cyrus22&r1=640&r2=641&view=diff
==============================================================================
--- branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/changelog (original)
+++ branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/changelog Tue Oct  3 17:28:54 2006
@@ -28,6 +28,7 @@
     - My own patch to 'squatter.c' to ignore remote mailboxes gracefully
     - Minor logging corrections to imap/tls.c and imtest/imtest.c
     - Double string copy in ptclient/ldap.c.
+   * cyr_expire should not scan remote mailboxes (upstream bug 2284)
 
   [ Benjamin Seidenberg ]
   * Remove patch files that are no longer used

Modified: branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/00list
URL: https://mail.incase.de/viewcvs/branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/00list?rev=641&root=cyrus22&r1=640&r2=641&view=diff
==============================================================================
--- branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/00list (original)
+++ branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/00list Tue Oct  3 17:28:54 2006
@@ -26,4 +26,5 @@
 72-faster-isdigit.dpatch
 75-update-imapd.conf-documentation.dpatch
 80-kbsd-no-psstrings.dpatch
+81-cyr_expire-remote-mailboxes.dpath
 99-update-autoconf.dpatch

Added: branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/81-cyr_expire-remote-mailboxes.dpath
URL: https://mail.incase.de/viewcvs/branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/81-cyr_expire-remote-mailboxes.dpath?rev=641&root=cyrus22&view=auto
==============================================================================
--- branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/81-cyr_expire-remote-mailboxes.dpath (added)
+++ branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/81-cyr_expire-remote-mailboxes.dpath Tue Oct  3 17:28:54 2006
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 81-cyr_expire-remote-mailboxes.dpath.dpatch by Farzad FARID <ffarid at pragmatic-source.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: cyr_expire should not scan remote mailboxes. Applied patch 
+## DP: https://bugzilla.andrew.cmu.edu/attachment.cgi?id=465&action=view for upstream
+## DP: bug 2884.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.3-2.3.7~/imap/cyr_expire.c cyrus-imapd-2.3-2.3.7/imap/cyr_expire.c
+--- cyrus-imapd-2.3-2.3.7~/imap/cyr_expire.c	2006-10-03 16:23:39.000000000 +0200
++++ cyrus-imapd-2.3-2.3.7/imap/cyr_expire.c	2006-10-03 16:25:32.000000000 +0200
+@@ -132,6 +132,18 @@
+     char buf[MAX_MAILBOX_NAME+1] = "", *p;
+     struct annotation_data attrib;
+     int r, domainlen = 0;
++    int mbtype;
++
++    /* Skip remote mailboxes */
++    r = mboxlist_detail(name, &mbtype, NULL, NULL, NULL, NULL, NULL);
++    if (r) {
++        if (erock->verbose) {
++            printf("error looking up %s: %s\n",
++		    name, error_message(r));
++        }
++        return 1;
++    }
++    if (mbtype & MBTYPE_REMOTE) return 0;
+ 
+     if (config_virtdomains && (p = strchr(name, '!')))
+ 	domainlen = p - name + 1;

Propchange: branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/81-cyr_expire-remote-mailboxes.dpath
------------------------------------------------------------------------------
    svn:executable = *