Remove orphan patches.

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

10 files changed, 22 insertions, 887 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index e89f4b9a822f..06aa4d7a45c1 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.146 2009/09/19 15:18:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.147 2009/09/25 10:42:39 flameeyes Exp $
+
+  25 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/cyrus-imapd-parallel.patch, -files/kolab/2.3.13/Logging.patch,
+  -files/kolab/2.3.13/annotations2.patch,
+  -files/kolab/2.3.13/folder-names.patch,
+  -files/kolab/2.3.13/cyrus-imap-admin-2.3.13-kolab-annotations.patch,
+  -files/kolab/2.3.13/groups.patch,
+  -files/kolab/2.3.13/timsieved_starttls-sendcaps.patch,
+  -files/kolab/2.3.13/uid.patch:
+  Remove orphan patches.
 
   19 Sep 2009; Jeroen Roovers <jer@gentoo.org> cyrus-imapd-2.3.14-r3.ebuild:
   Stable for HPPA (bug #283596).
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index d6fc83182bcb..504281311eb9 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,8 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cyrus-imapd-2.2-libwrap.patch 390 RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 SHA1 0075421585a73f2673e3daff9a4c140d9cc5046e SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e
 AUX cyrus-imapd-2.3.14-add-db47-support.patch 805 RMD160 18acd706ecdb14e8dc8713e1b66140fa13c65927 SHA1 e0008e89c924edb0f66587f2a312a06385a9a335 SHA256 09b275e21999355fea14ee173c9360658c02854b492c532b4bc58d301c387132
 AUX cyrus-imapd-2.3.14-bug283596-2.patch 2888 RMD160 668bb8caa2768fab0670818267d447d8dfd2ca74 SHA1 13dabf135e80283cf7fc0b59dc7978cdef097105 SHA256 bf231f56605b3d9da4ef591765a097d2cad558dc06b466e8df856934a32797ff
 AUX cyrus-imapd-2.3.14-fix-db-rpath.patch 1287 RMD160 bc4e98cfdd2c0be3091e728569540a7e1f17abc8 SHA1 97fcfbc3d7724f0ca1b9e3621a7609e53c631e6f SHA256 4443953d6042e8b521f59b62776d53c99f639f1c589f4b63d0ed94bbb5104a80
-AUX cyrus-imapd-parallel.patch 256 RMD160 fa7c53c847c4af9a7c218943be46b136b69f911c SHA1 8f4a7cbf91652354681e81e5c31f53728273a1c9 SHA256 adc6d031f2e9f547b192b36685d7873fdb5c5cb690e951b173fdcd55163cc68c
 AUX cyrus-imapd-strip.patch 527 RMD160 83dda22c91798715c7790c3964705b60edeab904 SHA1 624635c7a3dd17e0d3ed84c2c7b07fe042d54cc0 SHA256 4edf438766a291c18847efbcf0596e5c7fc848a1c04b851b20074a195c1b2f18
 AUX cyrus.conf 1354 RMD160 b2d6f470b7097036a5c64bc59f147f78fdbc16d5 SHA1 efc4d14807391be53018a81c4f4277cd8d6ce5f8 SHA256 23189674bb5c2f021f35027cfe22cfe56e022ce5e03da67f5c4913473bec1292
 AUX cyrus.confd 279 RMD160 da79ff4128869a045b432abc9cea6667b65ee69a SHA1 6d2d3417b678c77336a4b89db3507314302fe4eb SHA256 3e786c28ffc44a222214b22d8849728360edc37f4b3f7d7c1473a23ab58c28a9
@@ -10,13 +12,6 @@ AUX cyrus.pam-include 109 RMD160 24f82d0496f0ff94f9c1ee4cef14124909d361e5 SHA1 1
 AUX cyrus.rc6 568 RMD160 0494dc278b3c93f49018392694a809f1ec395459 SHA1 22e6f03d9365d0fef4af9236d9cd01ae0b94a67f SHA256 f2f796f1ab208bcd5641a1610b07673f92069e6f5b2370f453e3a24014ab2c6c
 AUX imap.pam 195 RMD160 18585b20cc2568a000ecb381f3299dedcc737d27 SHA1 0e64fbb8fb8da0cdae6fb0820ee3048f1e30bbf6 SHA256 e8068af6f4141fe2b7d7afbaf241be779ad6edb7e03d4dfdcf7ca8e991a8a5e0
 AUX imapd.conf 1587 RMD160 74e02af5daa7648ce7e366478c1b89b112750e6b SHA1 e4f189cb59fe499a42adffe3ffe382dcb9d7c546 SHA256 69eacd9fffad55f20990fcf3b117fe4e2ac55233515ed70698c65a6deb42503f
-AUX kolab/2.3.13/Logging.patch 1880 RMD160 a69ccc5fba3e200c5cf4bd91c22b5a7e9713038e SHA1 79ddbb6b9af2f0c93b8f9ee732ca2639c9567943 SHA256 76a4eb6cd59564f55bb541a35b4e7f5fbd8beabf8072580c0bc514d710c3879b
-AUX kolab/2.3.13/annotations2.patch 11178 RMD160 80b327392731fa0fd06ef8fcf34985489582e334 SHA1 b7f9f1d89b5a14efb1cae6a29f2b81bbea4aa81a SHA256 befae23d2873fa8fc0f42817e12d451dee884c4431b45ef0cdd25dfe474eed87
-AUX kolab/2.3.13/cyrus-imap-admin-2.3.13-kolab-annotations.patch 2980 RMD160 2c36aab1b8fde7160bddd714e65515cde91c8eef SHA1 eda6d2e3aedc00ce93fe1ab8e8cf7c44b5f43c31 SHA256 853a730ddcd3198af10850fee5a1182acd4b20d610fc309409be14e3e004369d
-AUX kolab/2.3.13/folder-names.patch 756 RMD160 83bba85afbe801dd332c0b823d0ccbe6ec0295d2 SHA1 dd68964df36cc1bf63034b9b13b563aae0d9a953 SHA256 fd3a111dcba98cf6dbdf1578ea4071f72f947701a9bac5251132d47607031704
-AUX kolab/2.3.13/groups.patch 6369 RMD160 1ff66dbbca2a3bd7dd6e6da9a6942fa0dbbc3de4 SHA1 0229d3050fcb6a68bf0d996872a84cc53123e232 SHA256 ad90f23e350bf43164979aead9b865bbf29bb8dc511d5e1c8775eb0254075cf2
-AUX kolab/2.3.13/timsieved_starttls-sendcaps.patch 824 RMD160 c07359f3c3c4b922bbddc9e717a1ec9b0de10c03 SHA1 05de31018a0ac1a7fce78d3a63b0c6c2e3adc9f1 SHA256 3249a502fe49df37f89133effd0f6a125d826ae425faa7e32e09a3279a1ad4b6
-AUX kolab/2.3.13/uid.patch 4328 RMD160 24a8e27218923e4284815439c889c208fbfc8be0 SHA1 e8a532d5f0462b07a90ff55f750ed313ec50141c SHA256 725a753fe877fb0bf257ef6968e64f15ad8758fbe9993dab310c0bbfb0b2c1b9
 AUX kolab/2.3.14/Annotations2.patch 11178 RMD160 80b327392731fa0fd06ef8fcf34985489582e334 SHA1 b7f9f1d89b5a14efb1cae6a29f2b81bbea4aa81a SHA256 befae23d2873fa8fc0f42817e12d451dee884c4431b45ef0cdd25dfe474eed87
 AUX kolab/2.3.14/Folder-names.patch 756 RMD160 83bba85afbe801dd332c0b823d0ccbe6ec0295d2 SHA1 dd68964df36cc1bf63034b9b13b563aae0d9a953 SHA256 fd3a111dcba98cf6dbdf1578ea4071f72f947701a9bac5251132d47607031704
 AUX kolab/2.3.14/Groups2.patch 6832 RMD160 e83ca372109e26a2b2f7101cd222bb79ed0e2be5 SHA1 f05b3c0702faab6d07b95710bb917680c69380c8 SHA256 629024b3558c10650543a5dd051b3714f2ae5ae9e13ffa5a4e988d63901c6f15
@@ -26,5 +21,12 @@ AUX kolab/2.3.14/timsieved_starttls-sendcaps.patch 849 RMD160 88fd0aff780cd21f61
 DIST cyrus-imapd-2.3.14.tar.gz 2348808 RMD160 03fd8bdef669786f58ddf8b3fa0e0a57b2ee6b69 SHA1 cf046e2399b5ae84c654c6ab04eb047341d93002 SHA256 fd840403c1f25adda8f003ea59169e2c87210c4e60ca47c498bda7060ed097a0
 EBUILD cyrus-imapd-2.3.14-r3.ebuild 8154 RMD160 c6945d72d7664cba550089592a30f29fa533d5cb SHA1 43dac3e1322889edd00a738d77f2c6371ff2e72e SHA256 8a410aa59540b246714bd02d25fea637cb901bd284c13268c377db2d90c21ecd
 EBUILD cyrus-imapd-2.3.14.ebuild 7396 RMD160 aa8db8f452f048e9db056062e524f6afcc09059b SHA1 20f2d7ef78caf7a883473780d07049b089d6bdf6 SHA256 088d29ea46912afc31bf06f213fcdd8fb585423e45e64b42f3d0ef697337c12f
-MISC ChangeLog 28960 RMD160 20613015267bf6a0e21082c4df9cd1f0c42addaf SHA1 c145ab36151509527a2e2fc192620044f5d155cd SHA256 d2efd1d42c79b3056e3e30010102bc01737dd0a7efcf605dad3df3b370df8c37
+MISC ChangeLog 29401 RMD160 1da457413779770486f3ff961ad421028b844dbb SHA1 4dc1a57de0e785602387f08fc214c3fcec4be57e SHA256 d6feee43d08ebe479a328c6dc1be69c9132423be8c942777122686e9675acdcd
 MISC metadata.xml 450 RMD160 43d7242bfdfcd5c328805bf7912fd07b20999ddc SHA1 53cb62e89c804226d5392cdeef9c45a8bdeaf99c SHA256 b8a9c9faf2353b9f33814cf9f12fa6183ab18449699d58104260109cef3c8470
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq8nqgACgkQAiZjviIA2XjuUQCdGDgIYmggN0J7L65R8C6auGXh
+mawAnjzWJtJ3w3DvI6ZrRNdr84XM0+Cp
+=Ao0n
+-----END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-parallel.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-parallel.patch
deleted file mode 100644
index 5932afc74bad..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-parallel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- imap/Makefile.in.orig	2006-08-28 09:32:33.000000000 -0700
-+++ imap/Makefile.in	2006-08-28 09:33:03.000000000 -0700
-@@ -155,6 +155,8 @@
- 
- ### Built Source Files
- 
-+version.o: xversion.h
-+
- xversion:
- 	rm -f version.o
- 	AWK=$(AWK) $(srcdir)/xversion.sh
diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.13/Logging.patch b/net-mail/cyrus-imapd/files/kolab/2.3.13/Logging.patch
deleted file mode 100644
index c0bd2faec033..000000000000
--- a/net-mail/cyrus-imapd/files/kolab/2.3.13/Logging.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Provides improved logging for the cyrus imapd server [Version: 2.3.9]
-
-diff -r 6162fc947b22 imap/append.c
---- a/imap/append.c	Tue Dec 11 11:22:03 2007 +0100
-+++ b/imap/append.c	Tue Dec 11 11:22:13 2007 +0100
-@@ -648,6 +648,9 @@ int append_fromstage(struct appendstate 
- 
-     /* ok, we've successfully added a message */
-     as->quota_used += message_index.size;
-+
-+    syslog(LOG_DEBUG, "append_fromstage: message %d added to %s",
-+	   message_index.uid, mailbox->name );
- 
-     return 0;
- }
-diff -r 6162fc947b22 imap/imapd.c
---- a/imap/imapd.c	Tue Dec 11 11:22:03 2007 +0100
-+++ b/imap/imapd.c	Tue Dec 11 11:22:13 2007 +0100
-@@ -3509,17 +3509,19 @@ void cmd_close(char *tag)
- 	if (!r) sync_log_mailbox(imapd_mailbox->name);
-     }
- 
-+    if (r) {
-+	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
-+    }
-+    else {
-+	prot_printf(imapd_out, "%s OK %s\r\n", tag,
-+		    error_message(IMAP_OK_COMPLETED));
-+	syslog(LOG_DEBUG, "cmd_expunge: user %s, mailbox %s, sequence %s",
-+	       imapd_userid, imapd_mailbox->name, "''");
-+    }
-+
-     index_closemailbox(imapd_mailbox);
-     mailbox_close(imapd_mailbox);
-     imapd_mailbox = 0;
--
--    if (r) {
--	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
--    }
--    else {
--	prot_printf(imapd_out, "%s OK %s\r\n", tag,
--		    error_message(IMAP_OK_COMPLETED));
--    }
- }    
- 
- /*
-diff -r 6162fc947b22 imap/mailbox.c
---- a/imap/mailbox.c	Tue Dec 11 11:22:03 2007 +0100
-+++ b/imap/mailbox.c	Tue Dec 11 11:22:13 2007 +0100
-@@ -2520,6 +2520,8 @@ int mailbox_expunge(struct mailbox *mail
- 	*(fname->tail)++ = '/';
- 	fname->len++;
- 	for (msgno = 0; msgno < numdeleted; msgno++) {
-+	    syslog(LOG_DEBUG, "mailbox_expunge: removing mail %s:%d",
-+		   mailbox->name, deleted[msgno]);
- 	    mailbox_message_get_fname(mailbox, deleted[msgno],
- 				      fname->tail,
- 				      sizeof(fname->buf) - fname->len);
diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.13/annotations2.patch b/net-mail/cyrus-imapd/files/kolab/2.3.13/annotations2.patch
deleted file mode 100644
index 87fa920fc08f..000000000000
--- a/net-mail/cyrus-imapd/files/kolab/2.3.13/annotations2.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-Provides a new version of annotation support for the cyrus imapd server [Version: 2.3.9]
-
-diff -r 321cda1d6136 imap/annotate.c
---- a/imap/annotate.c	Tue Apr 22 10:44:56 2008 +0200
-+++ b/imap/annotate.c	Tue Apr 22 10:47:04 2008 +0200
-@@ -90,6 +90,8 @@ int (*proxy_fetch_func)(const char *serv
- 			struct strlist *attribute_pat) = NULL;
- int (*proxy_store_func)(const char *server, const char *mbox_pat,
- 			struct entryattlist *entryatts) = NULL;
-+
-+void init_annotation_definitions();
- 
- /* String List Management */
- /*
-@@ -237,6 +239,8 @@ void annotatemore_init(int myflags,
-     if (store_func) {
- 	proxy_store_func = store_func;
-     }
-+    
-+    init_annotation_definitions();
- }
- 
- void annotatemore_open(char *fname)
-@@ -1832,6 +1836,224 @@ const struct annotate_st_entry mailbox_r
-     { NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL }
- };
- 
-+struct annotate_st_entry_list *server_entries_list = NULL;
-+struct annotate_st_entry_list *mailbox_rw_entries_list = NULL;
-+
-+enum {
-+  ANNOTATION_SCOPE_SERVER = 1,
-+  ANNOTATION_SCOPE_MAILBOX = 2
-+};
-+
-+const struct annotate_attrib annotation_scope_names[] =
-+{
-+    { "server", ANNOTATION_SCOPE_SERVER },
-+    { "mailbox", ANNOTATION_SCOPE_MAILBOX },
-+    { NULL, 0 }
-+};
-+
-+const struct annotate_attrib annotation_proxy_type_names[] =
-+{
-+    { "proxy", PROXY_ONLY },
-+    { "backend", BACKEND_ONLY },
-+    { "proxy_and_backend", PROXY_AND_BACKEND },
-+    { NULL, 0 }
-+};
-+
-+const struct annotate_attrib attribute_type_names[] = 
-+{
-+    { "content-type", ATTRIB_TYPE_CONTENTTYPE },
-+    { "string", ATTRIB_TYPE_STRING },
-+    { "boolean", ATTRIB_TYPE_BOOLEAN },
-+    { "uint", ATTRIB_TYPE_UINT },
-+    { "int", ATTRIB_TYPE_INT },
-+    { NULL, 0 }
-+};
-+
-+#define ANNOT_DEF_MAXLINELEN 1024
-+
-+int table_lookup(const struct annotate_attrib *table,
-+                                  char* name,
-+                                  size_t namelen,
-+                                  char* errmsg) 
-+/* search in table for the value given by name and namelen (name is null-terminated,
-+   but possibly more than just the key). errmsg is used to hint the user where we failed */
-+{
-+  char errbuf[ANNOT_DEF_MAXLINELEN*2];
-+  int entry;
-+  
-+  for (entry = 0; table[entry].name &&
-+                  (strncasecmp(table[entry].name, name, namelen)
-+                   || table[entry].name[namelen] != '\0'); entry++);
-+
-+  if (! table[entry].name) {
-+    sprintf(errbuf, "invalid %s at '%s'", errmsg, name);
-+    fatal(errbuf, EC_CONFIG);
-+  }
-+  return table[entry].entry;
-+}
-+
-+char *consume_comma(char* p)
-+  /* advance beyond the next ',', skipping whitespace, fail if next non-space is no comma */
-+{
-+  char errbuf[ANNOT_DEF_MAXLINELEN*2];
-+
-+  for (; *p && isspace(*p); p++);  
-+  if (*p != ',') {
-+    sprintf(errbuf, "',' expected, '%s' found parsing annotation definition",
-+            p);
-+    fatal(errbuf, EC_CONFIG);
-+  }
-+  p++;
-+  for (; *p && isspace(*p); p++);  
-+  
-+  return p;
-+}
-+
-+int parse_table_lookup_bitmask(const struct annotate_attrib *table,
-+                               char** s,
-+                               char* errmsg) 
-+  /* parses strings of the form value1 [ value2 [ ... ]]
-+     value1 is mapped via table to ints and the result ored
-+     whitespace is allowed between value names and punctuation
-+     the field must end in '\0' or ','
-+     s is advanced to '\0' or ','
-+     on error errmsg is used to identify item to be parsed
-+   */
-+{
-+  char errbuf[ANNOT_DEF_MAXLINELEN*2];
-+  int result = 0;
-+  char *p, *p2;
-+
-+  p = *s;
-+  do {
-+    p2 = p;
-+    for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++);
-+    result |= table_lookup(table, p2, p-p2, errmsg);
-+    for (; *p && isspace(*p); p++);
-+  } while (*p && *p != ',');
-+
-+  *s = p;
-+  return result;
-+}
-+
-+void init_annotation_definitions()
-+{
-+  char *p, *p2, *tmp;
-+  const char *filename;
-+  char aline[ANNOT_DEF_MAXLINELEN];
-+  char errbuf[ANNOT_DEF_MAXLINELEN*2];
-+  struct annotate_st_entry_list *se, *me;
-+  struct annotate_st_entry *ae;
-+  int i;
-+  FILE* f;
-+
-+  /* NOTE: we assume # static entries > 0 */
-+  server_entries_list = xmalloc(sizeof(struct annotate_st_entry_list));
-+  mailbox_rw_entries_list = xmalloc(sizeof(struct annotate_st_entry_list));
-+  se = server_entries_list;
-+  me = mailbox_rw_entries_list;
-+  /* copy static entries into list */
-+  for (i = 0; server_entries[i].name;i++) {
-+    se->entry = &server_entries[i];
-+    if (server_entries[i+1].name) {
-+      se->next = xmalloc(sizeof(struct annotate_st_entry_list));
-+      se = se->next;
-+    }
-+  }
-+  /* copy static entries into list */
-+  for (i = 0; mailbox_rw_entries[i].name;i++) {
-+    me->entry = &mailbox_rw_entries[i];
-+    if (mailbox_rw_entries[i+1].name) {
-+      me->next = xmalloc(sizeof(struct annotate_st_entry_list));
-+      me = me->next;
-+    }
-+  }
-+
-+  /* parse config file */
-+  filename = config_getstring(IMAPOPT_ANNOTATION_DEFINITIONS);
-+
-+  if (! filename) {
-+    se->next = NULL;
-+    me->next = NULL;
-+    return;
-+  }
-+  
-+  f = fopen(filename,"r");
-+  if (! f) {
-+    sprintf(errbuf, "could not open annotation definiton %s", filename);
-+    fatal(errbuf, EC_CONFIG);
-+  }
-+  
-+  while (fgets(aline, sizeof(aline), f)) {
-+    // remove leading space, skip blank lines and comments
-+    for (p = aline; *p && isspace(*p); p++);
-+    if (!*p || *p == '#') continue;
-+
-+    // note, we only do the most basic validity checking and may
-+    // be more restrictive than neccessary
-+
-+    ae = xmalloc(sizeof(struct annotate_st_entry));
-+
-+    p2 = p;
-+    for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++);
-+    // TV-TODO: should test for empty
-+    ae->name = xstrndup(p2, p-p2);
-+
-+    p = consume_comma(p);
-+  
-+    p2 = p;
-+    for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++);
-+
-+    if (table_lookup(annotation_scope_names, p2, p-p2,
-+                     "annotation scope")==ANNOTATION_SCOPE_SERVER) {
-+      se->next = xmalloc(sizeof(struct annotate_st_entry_list));
-+      se = se->next;
-+      se->entry = ae;
-+    }
-+    else {
-+      me->next = xmalloc(sizeof(struct annotate_st_entry_list));
-+      me = me->next;      
-+      me->entry = ae;
-+    }
-+    
-+    p = consume_comma(p);
-+    p2 = p;
-+    for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++);
-+    ae->type = table_lookup(attribute_type_names, p2, p-p2,
-+                                  "attribute type");
-+  
-+    p = consume_comma(p);
-+    ae->proxytype = parse_table_lookup_bitmask(annotation_proxy_type_names,
-+                                               &p,
-+                                               "annotation proxy type");
-+
-+    p = consume_comma(p);
-+    ae->attribs = parse_table_lookup_bitmask(annotation_attributes,
-+                                             &p,
-+                                             "annotation attributes");
-+    
-+    p = consume_comma(p);
-+    p2 = p;
-+    for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++);
-+    tmp = xstrndup(p2, p-p2);
-+    ae->acl = cyrus_acl_strtomask(tmp);
-+    free(tmp);
-+
-+    for (; *p && isspace(*p); p++);
-+    if (*p) {
-+      sprintf(errbuf, "junk at end of line: '%s'", p);
-+      fatal(errbuf, EC_CONFIG);
-+    }
-+    
-+    ae->set = annotation_set_todb;
-+    ae->rock = NULL;
-+  }
-+
-+  fclose(f);
-+  se->next = NULL;
-+  me->next = NULL;
-+}
-+
- int annotatemore_store(char *mailbox,
- 		       struct entryattlist *l,
- 		       struct namespace *namespace,
-@@ -1843,7 +2065,7 @@ int annotatemore_store(char *mailbox,
-     struct entryattlist *e = l;
-     struct attvaluelist *av;
-     struct storedata sdata;
--    const struct annotate_st_entry *entries;
-+    const struct annotate_st_entry_list *entries, *currententry;
-     time_t now = time(0);
- 
-     memset(&sdata, 0, sizeof(struct storedata));
-@@ -1854,45 +2076,45 @@ int annotatemore_store(char *mailbox,
- 
-     if (!mailbox[0]) {
- 	/* server annotations */
--	entries = server_entries;
-+	entries = server_entries_list;
-     }
-     else {
- 	/* mailbox annotation(s) */
--	entries = mailbox_rw_entries;
-+	entries = mailbox_rw_entries_list;
-     }
- 
-     /* Build a list of callbacks for storing the annotations */
-     while (e) {
--	int entrycount, attribs;
-+	int attribs;
- 	struct annotate_st_entry_list *nentry = NULL;
- 
- 	/* See if we support this entry */
--	for (entrycount = 0;
--	     entries[entrycount].name;
--	     entrycount++) {
--	    if (!strcmp(e->entry, entries[entrycount].name)) {
-+	for (currententry = entries;
-+	     currententry;
-+	     currententry = currententry->next) {
-+	    if (!strcmp(e->entry, currententry->entry->name)) {
- 		break;
- 	    }
- 	}
--	if (!entries[entrycount].name) {
-+	if (!currententry) {
- 	    /* unknown annotation */
- 	    return IMAP_PERMISSION_DENIED;
- 	}
- 
- 	/* Add this entry to our list only if it
- 	   applies to our particular server type */
--	if ((entries[entrycount].proxytype != PROXY_ONLY)
-+	if ((currententry->entry->proxytype != PROXY_ONLY)
- 	    || proxy_store_func) {
- 	    nentry = xzmalloc(sizeof(struct annotate_st_entry_list));
- 	    nentry->next = sdata.entry_list;
--	    nentry->entry = &(entries[entrycount]);
-+	    nentry->entry = currententry->entry;
- 	    nentry->shared.modifiedsince = now;
- 	    nentry->priv.modifiedsince = now;
- 	    sdata.entry_list = nentry;
- 	}
- 
- 	/* See if we are allowed to set the given attributes. */
--	attribs = entries[entrycount].attribs;
-+	attribs = currententry->entry->attribs;
- 	av = e->attvalues;
- 	while (av) {
- 	    const char *value;
-@@ -1902,7 +2124,7 @@ int annotatemore_store(char *mailbox,
- 		    goto cleanup;
- 		}
- 		value = annotate_canon_value(av->value,
--					     entries[entrycount].type);
-+					     currententry->entry->type);
- 		if (!value) {
- 		    r = IMAP_ANNOTATION_BADVALUE;
- 		    goto cleanup;
-@@ -1928,7 +2150,7 @@ int annotatemore_store(char *mailbox,
- 		    goto cleanup;
- 		}
- 		value = annotate_canon_value(av->value,
--					     entries[entrycount].type);
-+					     currententry->entry->type);
- 		if (!value) {
- 		    r = IMAP_ANNOTATION_BADVALUE;
- 		    goto cleanup;
-@@ -2110,3 +2332,10 @@ int annotatemore_delete(const char *mbox
- 
-     return annotatemore_rename(mboxname, NULL, NULL, NULL);
- }
-+
-+/* This file contains code Copyright (c) 2006 by Thomas Viehmann.
-+ * You may distribute source code or binaries under the conditions
-+ * conditions given in the CMU license, provided this note stays intact
-+ * in the distributed source. If you want to distribute my code without
-+ * this notice, do contact me at <tv@beamnet.de>.
-+ */
-diff -r 321cda1d6136 lib/imapoptions
---- a/lib/imapoptions	Tue Apr 22 10:44:56 2008 +0200
-+++ b/lib/imapoptions	Tue Apr 22 10:47:04 2008 +0200
-@@ -172,6 +172,9 @@ are listed with ``<none>''.
- /* Should non-admin users be allowed to set ACLs for the 'anyone'
-    user on their mailboxes?  In a large organization this can cause
-    support problems, but it's enabled by default. */
-+
-+{ "annotation_definitions", NULL, STRING }
-+/* File containing annotation definitions. */
- 
- { "auth_mech", "unix", STRINGLIST("unix", "pts", "krb", "krb5")}
- /* The authorization mechanism to use. */
diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.13/cyrus-imap-admin-2.3.13-kolab-annotations.patch b/net-mail/cyrus-imapd/files/kolab/2.3.13/cyrus-imap-admin-2.3.13-kolab-annotations.patch
deleted file mode 100644
index 3fd0a906ae12..000000000000
--- a/net-mail/cyrus-imapd/files/kolab/2.3.13/cyrus-imap-admin-2.3.13-kolab-annotations.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Allows to use arbitrary annotations with the cyradm tool.
-
-diff -r 639190be2385 doc/man/cyradm.1.html
---- a/doc/man/cyradm.1.html	Mon Oct 27 18:48:18 2008 +0100
-+++ b/doc/man/cyradm.1.html	Mon Oct 27 18:48:25 2008 +0100
-@@ -245,6 +245,13 @@
- <dd>
- <p>Sets an email address to which messages injected into the server via NNTP 
- will be sent.</p>
-+</dd>
-+</li>
-+<dt><strong><a NAME="item__2fexplicit_2fannotation"><code>/explicit/annotation</code></a></strong>
-+
-+<dd>
-+<p>Sets the annotation <em>/explicit/annotation</em>
-+on <em>mailbox</em> to <em>value</em>.</p>
- </dd>
- </li>
- <dt><strong><a name="sharedseen" class="item"><code>sharedseen</code></a></strong>
-diff -r 639190be2385 perl/imap/IMAP/Admin.pm
---- a/perl/imap/IMAP/Admin.pm	Mon Oct 27 18:48:18 2008 +0100
-+++ b/perl/imap/IMAP/Admin.pm	Mon Oct 27 18:48:26 2008 +0100
-@@ -797,11 +797,11 @@
-     return undef;
-   }
- 
--  if(!exists($values{$entry})) {
--    $self->{error} = "Unknown parameter $entry";
-+  if(exists($values{$entry})) {
-+    $entry = $values{$entry};    
-+  } else {
-+    $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
-   }
--
--  $entry = $values{$entry};
- 
-   my ($rc, $msg);
- 
-diff -r 639190be2385 perl/imap/IMAP/Shell.pm
---- a/perl/imap/IMAP/Shell.pm	Mon Oct 27 18:48:18 2008 +0100
-+++ b/perl/imap/IMAP/Shell.pm	Mon Oct 27 18:48:26 2008 +0100
-@@ -127,7 +127,7 @@
- 		  [\&_sc_info, '[mailbox]',
- 		   'display mailbox/server metadata'],
- 		mboxcfg =>
--		  [\&_sc_mboxcfg, 'mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value',
-+		  [\&_sc_mboxcfg, 'mailbox [comment|condstore|news2mail|expire|sieve|squat|/<explicit annotation>] value',
- 		   'configure mailbox'],
- 		mboxconfig => 'mboxcfg',
- 		reconstruct =>
-@@ -1437,7 +1437,7 @@
-   while (defined ($opt = shift(@argv))) {
-     last if $opt eq '--';
-     if ($opt =~ /^-/) {
--      die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n";
-+      die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value\n";
-     }
-     else {
-       push(@nargv, $opt);
-@@ -1446,7 +1446,7 @@
-   }
-   push(@nargv, @argv);
-   if (@nargv < 2) {
--    die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n";
-+    die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value\n";
-   }
-   if (!$cyrref || !$$cyrref) {
-     die "mboxconfig: no connection to server\n";
-diff -r 639190be2385 perl/imap/cyradm.sh
---- a/perl/imap/cyradm.sh	Mon Oct 27 18:48:18 2008 +0100
-+++ b/perl/imap/cyradm.sh	Mon Oct 27 18:48:26 2008 +0100
-@@ -241,6 +241,10 @@
- 
- Indicates that the mailbox should have a squat index created for it.
- 
-+=item C</explicit/annotation>
-+
-+Sets the annotation I</explicit/annotation> on I<mailbox> to I<value>. 
-+
- =back 
- 
- =item C<renamemailbox> [C<--partition> I<partition>] I<oldname> I<newname>
diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.13/folder-names.patch b/net-mail/cyrus-imapd/files/kolab/2.3.13/folder-names.patch
deleted file mode 100644
index 2f8689ae4ed4..000000000000
--- a/net-mail/cyrus-imapd/files/kolab/2.3.13/folder-names.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Modifies the set of accepted characters in folder names for the cyrus imapd server [Version: 2.3.9]
-
-diff -r 17e54b46d7b6 imap/mboxname.c
---- a/imap/mboxname.c	Mon Oct 27 18:44:56 2008 +0100
-+++ b/imap/mboxname.c	Mon Oct 27 18:47:11 2008 +0100
-@@ -713,8 +713,10 @@
- /*
-  * Apply site policy restrictions on mailbox names.
-  * Restrictions are hardwired for now.
-+ * original definition 
-+#define GOODCHARS " #$'+,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"
-  */
--#define GOODCHARS " #$'+,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"
-+#define GOODCHARS " #$%'()*+,-.0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~"
- int mboxname_policycheck(char *name)
- {
-     unsigned i;
diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.13/groups.patch b/net-mail/cyrus-imapd/files/kolab/2.3.13/groups.patch
deleted file mode 100644
index 14f40cffec51..000000000000
--- a/net-mail/cyrus-imapd/files/kolab/2.3.13/groups.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-diff -r 0d5aacd84718 lib/auth_unix.c
---- a/lib/auth_unix.c	Mon Oct 27 18:37:49 2008 +0100
-+++ b/lib/auth_unix.c	Mon Oct 27 18:43:28 2008 +0100
-@@ -46,12 +46,133 @@
- #include <stdlib.h>
- #include <pwd.h>
- #include <grp.h>
-+#include <stdio.h>
- #include <ctype.h>
- #include <string.h>
- 
- #include "auth.h"
- #include "libcyr_cfg.h"
- #include "xmalloc.h"
-+
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+/*
-+ * __getgrent.c - This file is part of the libc-8086/grp package for ELKS,
-+ * Copyright (C) 1995, 1996 Nat Friedman <ndf@linux.mit.edu>.
-+ * 
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Library General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Library General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Library General Public
-+ *  License along with this library; if not, write to the Free
-+ *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+
-+#include <unistd.h>
-+#include <string.h>
-+#include <errno.h>
-+
-+static struct group *__getgrent(int grp_fd, char *line_buff, char **members)
-+{
-+    short line_index;
-+    short buff_size;
-+    static struct group group;
-+    register char *ptr;
-+    char *field_begin;
-+    short member_num;
-+    char *endptr;
-+    int line_len;
-+
-+    /* We use the restart label to handle malformatted lines */
-+    restart:
-+    line_index = 0;
-+    buff_size = 256;
-+
-+    line_buff = realloc(line_buff, buff_size);
-+    while (1) {
-+        if ((line_len = read(grp_fd, line_buff + line_index,
-+                        buff_size - line_index)) <= 0) {
-+            return NULL;
-+        }
-+        field_begin = strchr(line_buff, '\n');
-+        if (field_begin != NULL) {
-+            lseek(grp_fd,
-+                    (long) (1 + field_begin -
-+                            (line_len + line_index + line_buff)), SEEK_CUR);
-+            *field_begin = '\0';
-+            if (*line_buff == '#' || *line_buff == ' '
-+                    || *line_buff == '\n' || *line_buff == '\t')
-+                goto restart;
-+            break;
-+        } else {
-+            /* Allocate some more space */
-+            line_index = buff_size;
-+            buff_size += 256;
-+            line_buff = realloc(line_buff, buff_size);
-+        }
-+    }
-+
-+    /* Now parse the line */
-+    group.gr_name = line_buff;
-+    ptr = strchr(line_buff, ':');
-+    if (ptr == NULL)
-+        goto restart;
-+    *ptr++ = '\0';
-+
-+    group.gr_passwd = ptr;
-+    ptr = strchr(ptr, ':');
-+    if (ptr == NULL)
-+        goto restart;
-+    *ptr++ = '\0';
-+
-+    field_begin = ptr;
-+    ptr = strchr(ptr, ':');
-+    if (ptr == NULL)
-+        goto restart;
-+    *ptr++ = '\0';
-+
-+    group.gr_gid = (gid_t) strtoul(field_begin, &endptr, 10);
-+    if (*endptr != '\0')
-+        goto restart;
-+
-+    member_num = 0;
-+    field_begin = ptr;
-+
-+    if (members != NULL)
-+        free(members);
-+    members = (char **) malloc((member_num + 1) * sizeof(char *));
-+    for ( ; field_begin && *field_begin != '\0'; field_begin = ptr) {
-+        if ((ptr = strchr(field_begin, ',')) != NULL)
-+            *ptr++ = '\0';
-+        members[member_num++] = field_begin;
-+        members = (char **) realloc(members,
-+                (member_num + 1) * sizeof(char *));
-+    }
-+    members[member_num] = NULL;
-+
-+    group.gr_mem = members;
-+    return &group;
-+}
-+    
-+static char *line_buff = NULL;
-+static char **members  = NULL;
-+
-+struct group *fgetgrent(FILE *file)
-+{
-+    if (file == NULL) {
-+        errno = EINTR;
-+        return NULL;
-+    }
-+    return __getgrent(fileno(file), line_buff, members);
-+}
-+#endif /* __FreeBSD__ */
- 
- struct auth_state {
-     char userid[81];
-@@ -140,6 +261,25 @@
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
- };
- 
-+static struct group* fgetgrnam(const char* name)
-+{
-+    struct group *grp;
-+    FILE *groupfile;
-+
-+    groupfile = fopen("/etc/imapd.group", "r");
-+    if (!groupfile) groupfile = fopen("/etc/group", "r");
-+    if (groupfile) {
-+       while ((grp = fgetgrent(groupfile))) {
-+         if (strcasecmp(grp->gr_name, name) == 0) {
-+           fclose(groupfile);
-+           return grp;
-+         }
-+       }
-+    } 
-+    if (groupfile) fclose(groupfile);
-+    return NULL;
-+} 
-+
- /*
-  * Convert 'identifier' into canonical form.
-  * Returns a pointer to a static buffer containing the canonical form
-@@ -175,7 +315,7 @@
-      */
-     
-     if (!strncmp(retbuf, "group:", 6)) {
--	grp = getgrnam(retbuf+6);
-+	grp = fgetgrnam(retbuf+6);
- 	if (!grp) return NULL;
- 	if (strlen(grp->gr_name) >= sizeof(retbuf)-6)
- 		return NULL;
-@@ -228,6 +368,7 @@
-     int ret, ngroups = 10;
- #else
-     char **mem;
-+    FILE *groupfile;
- #endif
- 
-     identifier = mycanonifyid(identifier, 0);
-@@ -283,20 +424,23 @@
-     if (groupids) free(groupids);
- 
- #else /* !HAVE_GETGROUPLIST */
--    setgrent();
--    while ((grp = getgrent())) {
--	for (mem = grp->gr_mem; *mem; mem++) {
--	    if (!strcmp(*mem, identifier)) break;
--	}
-+    groupfile = fopen("/etc/imapd.group", "r");
-+    if (!groupfile) groupfile = fopen("/etc/group", "r");
-+    if (groupfile) {
-+       while ((grp = fgetgrent(groupfile))) {
-+         for (mem = grp->gr_mem; *mem; mem++) {
-+            if (!strcasecmp(*mem, identifier)) break;
-+         }
- 
--	if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) {
--	    newstate->ngroups++;
--	    newstate->group = (char **)xrealloc((char *)newstate->group,
--						newstate->ngroups * sizeof(char *));
--	    newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name);
--	}
--    }
--    endgrent();
-+         if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) {
-+            newstate->ngroups++;
-+            newstate->group = (char **)xrealloc((char *)newstate->group,
-+                                                newstate->ngroups * sizeof(char *));
-+            newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name);
-+         }
-+       }
-+       fclose(groupfile);
-+    } 
- #endif /* HAVE_GETGROUPLIST */
- 
-     return newstate;
diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.13/timsieved_starttls-sendcaps.patch b/net-mail/cyrus-imapd/files/kolab/2.3.13/timsieved_starttls-sendcaps.patch
deleted file mode 100644
index 48524e9df5c8..000000000000
--- a/net-mail/cyrus-imapd/files/kolab/2.3.13/timsieved_starttls-sendcaps.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-This patch was downloaded from https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/timsieved/parser.c.diff?r1=1.44;r2=1.45
-(minus the CVS keywords)
-
-It should be reverse-applied with patch -p2 -R to work around the kontact
-behaviour described in kolab/issue2443 (kontact aborts sieve when imapd sends
-capabilities after starttls) and can be dropped as soon as kontact has a way
-to work with old and new cyrus imapd servers.
-
---- a/timsieved/parser.c	2007/11/26 20:23:06	1.44
-+++ b/timsieved/parser.c	2007/12/10 14:47:08	1.45
-@@ -861,7 +861,7 @@ static int cmd_starttls(struct protstrea
- 
-     starttls_done = 1;
- 
--    return capabilities(sieved_out, sieved_saslconn, starttls_done, authenticated);
-+    return result;
- }
- #else
- static int cmd_starttls(struct protstream *sieved_out, struct protstream *sieved_in)
diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.13/uid.patch b/net-mail/cyrus-imapd/files/kolab/2.3.13/uid.patch
deleted file mode 100644
index ecc960d7bffe..000000000000
--- a/net-mail/cyrus-imapd/files/kolab/2.3.13/uid.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Allows login by uid rather than the mail address on the cyrus imapd server [Version: 2.3.9]
-
-diff -r 2ebe14b7db9d configure
---- a/configure	Mon Oct 27 18:47:12 2008 +0100
-+++ b/configure	Mon Oct 27 18:48:18 2008 +0100
-@@ -19667,7 +19667,7 @@
- done
- 
- IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
--IMAP_LIBS="${LIB_SASL} ${LIBS} ${SQL_LIBS}"
-+IMAP_LIBS="${LIB_SASL} -lldap -llber ${LIBS} ${SQL_LIBS}"
- 
- 
- 
-diff -r 2ebe14b7db9d imap/global.c
---- a/imap/global.c	Mon Oct 27 18:47:12 2008 +0100
-+++ b/imap/global.c	Mon Oct 27 18:48:18 2008 +0100
-@@ -52,6 +52,9 @@
- #include <sys/types.h>
- #include <netinet/in.h>
- #include <sys/stat.h>
-+
-+#include <ldap.h>
-+#include <lber.h>
- 
- #if HAVE_UNISTD_H
- # include <unistd.h>
-@@ -378,6 +381,18 @@
-     char *domain = NULL;
-     int len = strlen(user);
-     char buf[81];
-+    const char *uri;
-+    const char *base;
-+    const char *binddn;
-+    const char *bindpw;
-+    struct timeval timeout;
-+    char filter[255];
-+    LDAP *handle;
-+    LDAPMessage *res;
-+    LDAPMessage *entry;
-+    struct berval** vals;
-+
-+    int rc;
- 
-     /* check for domain */
-     if (config_virtdomains &&
-@@ -396,6 +411,49 @@
-     }
- 
-     if (config_virtdomains) {
-+        if (config_virtdomains == IMAP_ENUM_VIRTDOMAINS_LDAP) {
-+           uri = config_getstring(IMAPOPT_LDAP_URI);
-+           base = config_getstring(IMAPOPT_LDAP_BASE);
-+           binddn = config_getstring(IMAPOPT_LDAP_BIND_DN);
-+           bindpw = config_getstring(IMAPOPT_LDAP_PASSWORD);
-+           timeout.tv_sec = config_getint(IMAPOPT_LDAP_TIME_LIMIT);
-+           timeout.tv_usec = 0;
-+           sprintf(filter, "(uid=%s)", user);
-+           rc = ldap_initialize(&handle, uri);
-+           if (rc != LDAP_SUCCESS) {
-+                syslog(LOG_ERR, "ldap_initialize failed (%s)", uri);
-+           } else {
-+	        rc = ldap_simple_bind_s(handle, binddn, bindpw);
-+	        if (rc != LDAP_SUCCESS) {
-+                     syslog(LOG_ERR, "ldap_simple_bind() failed %d (%s)", rc, ldap_err2string(rc));
-+	        } else {
-+	             rc = ldap_search_st(handle, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, &timeout, &res);
-+                     if (rc != LDAP_SUCCESS) {
-+                          syslog(LOG_ERR, "ldap_search_st failed %d (%s)", rc, ldap_err2string(rc));
-+                     } else {
-+	                  if ( (entry = ldap_first_entry(handle, res)) != NULL ) {
-+			       // read mail attribute from entry
-+			       if ( (vals = ldap_get_values_len(handle, entry, "mail")) ) {
-+  				    if (memchr(vals[0]->bv_val, '@', vals[0]->bv_len)) {
-+				        static char buf[81]; /* same size as in auth_canonifyid */
-+					   int len = ((sizeof(buf) - 1) > vals[0]->bv_len ? vals[0]->bv_len : sizeof(buf) - 1);
-+					strncpy( buf, vals[0]->bv_val, len);
-+					buf[len] = '\0'; /* make sure it's null-terminated */
-+					ldap_value_free_len( vals );
-+				        ldap_msgfree( res );
-+					ldap_unbind_s(handle); /* also frees handle */
-+					syslog(LOG_DEBUG, "canonify: '%s'\n", buf);
-+				        return auth_canonifyid( buf, 0) ;
-+				    }
-+				    ldap_value_free_len( vals );
-+			       }			       	
-+   	                  }
-+			  ldap_msgfree( res );
-+                     }
-+                }
-+		ldap_unbind_s(handle); /* also frees handle */
-+           }
-+        }
- 	if (domain) {
- 	    if (config_defdomain && !strcasecmp(config_defdomain, domain+1)) {
- 		*domain = '\0'; /* trim the default domain */
-@@ -408,7 +466,7 @@
- 		user = buf;
- 	    }
- 	}
--	else if (config_virtdomains != IMAP_ENUM_VIRTDOMAINS_USERID) {
-+	else if (config_virtdomains != IMAP_ENUM_VIRTDOMAINS_USERID && config_virtdomains != IMAP_ENUM_VIRTDOMAINS_LDAP) {
- 	    socklen_t salen;
- 	    int error;
- 	    struct sockaddr_storage localaddr;
-diff -r 2ebe14b7db9d lib/imapoptions
---- a/lib/imapoptions	Mon Oct 27 18:47:12 2008 +0100
-+++ b/lib/imapoptions	Mon Oct 27 18:48:18 2008 +0100
-@@ -1114,7 +1114,7 @@
-    mailbox hierarchy.  The default is to use the netnews separator
-    character '.'. */
- 
--{ "virtdomains", "off", ENUM("off", "userid", "on") }
-+{ "virtdomains", "off", ENUM("off", "userid", "ldap", "on") }
- /* Enable virtual domain support.  If enabled, the user's domain will
-    be determined by splitting a fully qualified userid at the last '@'
-    or '%' symbol.  If the userid is unqualified, and the virtdomains