steffen: server/kolabd/kolabd/templates main.cf.template, 1.15, 1.15.2.1

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv1062

Modified Files:
      Tag: kolab_2_0_branch
	main.cf.template 
Log Message:
deletion handling

Index: main.cf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -d -r1.15 -r1.15.2.1
--- main.cf.template	10 Jun 2005 23:54:37 -0000	1.15
+++ main.cf.template	28 Jul 2005 01:53:55 -0000	1.15.2.1
@@ -136,7 +136,7 @@
 
 ldapvirtual_server_host = @@@ldap_uri@@@
 ldapvirtual_search_base = @@@user_dn_list@@@
-ldapvirtual_query_filter = (|(alias=%s)(mail=%s))
+ldapvirtual_query_filter = (&(!kolabDeleteFlag=*)(|(alias=%s)(mail=%s)))
 ldapvirtual_result_attribute = mail
 ldapvirtual_result_filter = %s
 ldapvirtual_search_timeout = 15
@@ -158,7 +158,7 @@
 ldapdistlist_server_host = @@@ldap_uri@@@
 ldapdistlist_search_base = @@@user_dn_list@@@
 ldapdistlist_domain = $mydestination
-ldapdistlist_query_filter = (&(objectClass=kolabGroupOfNames)(mail=%s))
+ldapdistlist_query_filter = (&(objectClass=kolabGroupOfNames)(!(kolabDeleteFlag=*))(mail=%s))
 ldapdistlist_special_result_attribute = member
 ldapdistlist_exclude_internal = yes
 ldapdistlist_result_attribute = mail