steffen: server/imapd kolab-ldap.patch,1.1,1.2
cvs at intevation.de
cvs at intevation.de
Wed Aug 18 00:29:17 CEST 2004
Author: steffen
Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv1768
Modified Files:
kolab-ldap.patch
Log Message:
Fix for Issue294
Index: kolab-ldap.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab-ldap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-ldap.patch 15 Jul 2004 19:45:30 -0000 1.1
+++ kolab-ldap.patch 17 Aug 2004 22:29:15 -0000 1.2
@@ -1,37 +1,18 @@
---- ./lib/imapoptions.orig 2004-07-12 14:18:31.000000000 +0200
-+++ ./lib/imapoptions 2004-07-12 14:19:22.000000000 +0200
-@@ -823,7 +823,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
---- ./lib/imapopts.c.orig 2004-07-12 14:15:09.000000000 +0200
-+++ ./lib/imapopts.c 2004-07-13 16:31:09.580924368 +0200
-@@ -183,7 +183,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 } } },
+diff -urp ../cyrus-imapd-2.2.6.orig/configure ./configure
+--- ../cyrus-imapd-2.2.6.orig/configure 2004-06-17 20:55:49.000000000 +0200
++++ ./configure 2004-08-18 00:08:52.000000000 +0200
+@@ -14348,7 +14348,7 @@ for flag in ${ldflags} ${default_ldflags
+ done
- { IMAPOPT_LAST, NULL, 0, { NULL }, OPT_NOTOPT, { { NULL, IMAP_ENUM_ZERO } } }
+ IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
+-IMAP_LIBS="${LIB_SASL} ${LIBS}"
++IMAP_LIBS="${LIB_SASL} -lldap -llber ${LIBS}"
---- ./lib/imapopts.h.orig 2004-07-12 14:16:36.000000000 +0200
-+++ ./lib/imapopts.h 2004-07-13 16:31:09.580924368 +0200
-@@ -185,6 +185,7 @@
- IMAP_ENUM_VIRTDOMAINS_OFF = 0,
- IMAP_ENUM_VIRTDOMAINS_USERID,
-+ IMAP_ENUM_VIRTDOMAINS_LDAP,
- IMAP_ENUM_VIRTDOMAINS_ON,
- };
---- ./imap/global.c.orig 2004-07-12 14:25:03.000000000 +0200
-+++ ./imap/global.c 2004-07-13 17:31:50.780377912 +0200
+diff -urp ../cyrus-imapd-2.2.6.orig/imap/global.c ./imap/global.c
+--- ../cyrus-imapd-2.2.6.orig/imap/global.c 2004-05-22 05:45:49.000000000 +0200
++++ ./imap/global.c 2004-08-18 00:09:45.000000000 +0200
@@ -52,6 +52,9 @@
#include <netinet/in.h>
#include <sys/stat.h>
@@ -42,7 +23,7 @@
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
-@@ -349,6 +352,18 @@
+@@ -349,6 +352,18 @@ char *canonify_userid(char *user, char *
char *domain = NULL;
int len = strlen(user);
char buf[81];
@@ -61,7 +42,7 @@
/* check for domain */
if (config_virtdomains &&
-@@ -367,6 +382,37 @@
+@@ -367,6 +382,37 @@ char *canonify_userid(char *user, char *
}
if (config_virtdomains) {
@@ -99,14 +80,47 @@
if (domain) {
if (config_defdomain && !strcasecmp(config_defdomain, domain+1)) {
*domain = '\0'; /* trim the default domain */
---- ./configure.orig 2004-07-13 17:06:40.865919800 +0200
-+++ ./configure 2004-07-13 17:06:52.175200528 +0200
-@@ -14348,7 +14348,7 @@
- done
+@@ -379,7 +425,7 @@ char *canonify_userid(char *user, char *
+ 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 -urp ../cyrus-imapd-2.2.6.orig/lib/imapoptions ./lib/imapoptions
+--- ../cyrus-imapd-2.2.6.orig/lib/imapoptions 2004-05-25 02:03:05.000000000 +0200
++++ ./lib/imapoptions 2004-08-18 00:08:52.000000000 +0200
+@@ -823,7 +823,7 @@ are listed with ``<none>''.
+ mailbox hierarchy. The default is to use the netnews separator
+ character '.'. */
- IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
--IMAP_LIBS="${LIB_SASL} ${LIBS}"
-+IMAP_LIBS="${LIB_SASL} -lldap -llber ${LIBS}"
+-{ "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
+diff -urp ../cyrus-imapd-2.2.6.orig/lib/imapopts.c ./lib/imapopts.c
+--- ../cyrus-imapd-2.2.6.orig/lib/imapopts.c 2004-06-17 20:55:50.000000000 +0200
++++ ./lib/imapopts.c 2004-08-18 00:08:52.000000000 +0200
+@@ -183,7 +183,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 -urp ../cyrus-imapd-2.2.6.orig/lib/imapopts.h ./lib/imapopts.h
+--- ../cyrus-imapd-2.2.6.orig/lib/imapopts.h 2004-06-17 20:55:50.000000000 +0200
++++ ./lib/imapopts.h 2004-08-18 00:08:52.000000000 +0200
+@@ -185,6 +185,7 @@ enum enum_value {
+ IMAP_ENUM_VIRTDOMAINS_OFF = 0,
+ IMAP_ENUM_VIRTDOMAINS_USERID,
++ IMAP_ENUM_VIRTDOMAINS_LDAP,
+ IMAP_ENUM_VIRTDOMAINS_ON,
+
+ };
More information about the commits
mailing list