[pkg-kolab] r176 - trunk/kolab-cyrus-imapd/debian/patches

[Steffen Joeris]

Author: white-guest
Date: 2006-01-18 12:52:32 +0000 (Wed, 18 Jan 2006)
New Revision: 176

Modified:
   trunk/kolab-cyrus-imapd/debian/patches/140-kolab-ldap.dpatch
Log:
* correct patch and let compiler work :)


Modified: trunk/kolab-cyrus-imapd/debian/patches/140-kolab-ldap.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/140-kolab-ldap.dpatch	2006-01-18 12:51:50 UTC (rev 175)
+++ trunk/kolab-cyrus-imapd/debian/patches/140-kolab-ldap.dpatch	2006-01-18 12:52:32 UTC (rev 176)
@@ -115,24 +115,3 @@
  /* 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
---- kolab-cyrus-imapd-2.2.12/lib/imapopts.c.orig	2006-01-11 22:26:25.000000000 +0100
-+++ kolab-cyrus-imapd-2.2.12/lib/imapopts.c	2006-01-11 22:27:37.000000000 +0100
-@@ -186,7 +186,7 @@
-   { IMAPOPT_USERPREFIX, "userprefix", 0, {(void *)("Other Users")}, OPT_STRING, {  { NULL, IMAP_ENUM_ZERO } } },
-   { IMAPOPT_UNIX_GROUP_ENABLE, "unix_group_enable", 0, {(void*)1}, OPT_SWITCH, {  { NULL, IMAP_ENUM_ZERO } } },
-   { IMAPOPT_UNIXHIERARCHYSEP, "unixhierarchysep", 0, {(void*)0}, OPT_SWITCH, {  { NULL, IMAP_ENUM_ZERO } } },
--  { IMAPOPT_VIRTDOMAINS, "virtdomains", 0, {(void *)(IMAP_ENUM_VIRTDOMAINS_OFF)}, OPT_ENUM, { { "off" , IMAP_ENUM_VIRTDOMAINS_OFF }, { "userid" , IMAP_ENUM_VIRTDOMAINS_USERID }, { "on" , IMAP_ENUM_VIRTDOMAINS_ON },  { NULL, IMAP_ENUM_ZERO } } },
-+  { IMAPOPT_VIRTDOMAINS, "virtdomains", 0, {(void *)(IMAP_ENUM_VIRTDOMAINS_OFF)}, OPT_ENUM, { { "off" , IMAP_ENUM_VIRTDOMAINS_OFF }, { "userid" , IMAP_ENUM_VIRTDOMAINS_USERID }, { "ldap" , IMAP_ENUM_VIRTDOMAINS_LDAP }, { "on" , IMAP_ENUM_VIRTDOMAINS_ON },  { NULL, IMAP_ENUM_ZERO } } },
- 
-   { IMAPOPT_LAST, NULL, 0, { NULL }, OPT_NOTOPT, {  { NULL, IMAP_ENUM_ZERO } } }
- 
---- kolab-cyrus-imapd-2.2.12/lib/imapopts.h.orig	2006-01-11 22:29:39.000000000 +0100
-+++ kolab-cyrus-imapd-2.2.12/lib/imapopts.h	2006-01-11 22:30:11.000000000 +0100
-@@ -188,6 +188,7 @@
- 
-   IMAP_ENUM_VIRTDOMAINS_ON,
-   IMAP_ENUM_VIRTDOMAINS_USERID,
-+  IMAP_ENUM_VIRTDOMAINS_LDAP,
-   IMAP_ENUM_VIRTDOMAINS_OFF = 0
- 
- };