steffen: server/kolabd/kolabd/templates main.cf.template, 1.16, 1.17

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	main.cf.template 
Log Message:
dont deliver to soon-to-be-killed objects

Index: main.cf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- main.cf.template	1 Jul 2005 13:01:37 -0000	1.16
+++ main.cf.template	15 Jul 2005 00:40:46 -0000	1.17
@@ -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