gunnar: server/patches/cyrus-imapd KOLAB_cyrus-imapd_2.3.9_UID.patch, 1.1, 1.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/patches/cyrus-imapd
In directory doto:/tmp/cvs-serv1102

Modified Files:
	KOLAB_cyrus-imapd_2.3.9_UID.patch 
Log Message:
Fix the UID patch. Both imapopts.* files are generated automatically and should be regenerated at build time.

Index: KOLAB_cyrus-imapd_2.3.9_UID.patch
===================================================================
RCS file: /kolabrepository/server/patches/cyrus-imapd/KOLAB_cyrus-imapd_2.3.9_UID.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- KOLAB_cyrus-imapd_2.3.9_UID.patch	29 Sep 2007 12:13:54 -0000	1.1
+++ KOLAB_cyrus-imapd_2.3.9_UID.patch	15 Oct 2007 09:21:11 -0000	1.2
@@ -1,8 +1,8 @@
 Allows login by uid rather than the mail address on the cyrus imapd server [Version: 2.3.9]
 
-diff -r db07337ac0c3 configure
---- a/configure	Sat Sep 29 13:41:01 2007 +0200
-+++ b/configure	Sat Sep 29 13:41:15 2007 +0200
+diff -r a0335c09d80e configure
+--- a/configure	Mon Oct 01 11:18:56 2007 +0200
++++ b/configure	Mon Oct 15 11:10:31 2007 +0200
 @@ -18094,7 +18094,7 @@ done
  done
  
@@ -12,9 +12,9 @@
  
  
  
-diff -r db07337ac0c3 imap/global.c
---- a/imap/global.c	Sat Sep 29 13:41:01 2007 +0200
-+++ b/imap/global.c	Sat Sep 29 13:41:15 2007 +0200
+diff -r a0335c09d80e imap/global.c
+--- a/imap/global.c	Mon Oct 01 11:18:56 2007 +0200
++++ b/imap/global.c	Mon Oct 15 11:10:31 2007 +0200
 @@ -52,6 +52,9 @@
  #include <netinet/in.h>
  #include <sys/stat.h>
@@ -101,10 +101,10 @@
  	    socklen_t salen;
  	    int error;
  	    struct sockaddr_storage localaddr;
-diff -r db07337ac0c3 lib/imapoptions
---- a/lib/imapoptions	Sat Sep 29 13:41:01 2007 +0200
-+++ b/lib/imapoptions	Sat Sep 29 13:41:15 2007 +0200
-@@ -1014,7 +1014,7 @@ are listed with ``<none>''.
+diff -r a0335c09d80e lib/imapoptions
+--- a/lib/imapoptions	Mon Oct 01 11:18:56 2007 +0200
++++ b/lib/imapoptions	Mon Oct 15 11:10:31 2007 +0200
+@@ -1017,7 +1017,7 @@ are listed with ``<none>''.
     mailbox hierarchy.  The default is to use the netnews separator
     character '.'. */
  
@@ -113,26 +113,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
-diff -r db07337ac0c3 lib/imapopts.c
---- a/lib/imapopts.c	Sat Sep 29 13:41:01 2007 +0200
-+++ b/lib/imapopts.c	Sat Sep 29 13:41:15 2007 +0200
-@@ -216,7 +216,7 @@ struct imapopt_s imapopts[] =
-   { 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 } } }
- 
-diff -r db07337ac0c3 lib/imapopts.h
---- a/lib/imapopts.h	Sat Sep 29 13:41:01 2007 +0200
-+++ b/lib/imapopts.h	Sat Sep 29 13:41:15 2007 +0200
-@@ -217,6 +217,7 @@ enum enum_value {
- 
-   IMAP_ENUM_VIRTDOMAINS_ON,
-   IMAP_ENUM_VIRTDOMAINS_USERID,
-+  IMAP_ENUM_VIRTDOMAINS_LDAP,
-   IMAP_ENUM_VIRTDOMAINS_OFF = 0,
-   IMAP_ENUM_SIEVE_EXTENSIONS_COPY = (1<<11),
-   IMAP_ENUM_SIEVE_EXTENSIONS_SUBADDRESS = (1<<10),