--- templates/slapd.conf.template	2005-08-01 18:34:02.000000000 +0200
+++ templates/slapd.conf.template.oden	2005-08-27 13:18:45.000000000 +0200
@@ -1,7 +1,7 @@
 KOLAB_META_START
 TARGET=@l_prefix@/etc/openldap/slapd.conf
 PERMISSIONS=0640
-OWNERSHIP=@l_musr@:@l_mgrp@
+OWNERSHIP=root:ldap
 KOLAB_META_END
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
 # (c) 2003-2005 Martin Konold <martin.konold@erfrakon.de>
@@ -16,19 +16,27 @@
 # manual additions are lost unless made to the template in the Kolab config directory
 # the template is  @l_prefix@/etc/kolab/slapd.conf.template
 
-include @l_prefix@/etc/openldap/schema/core.schema
-include @l_prefix@/etc/openldap/schema/cosine.schema
-include @l_prefix@/etc/openldap/schema/inetorgperson.schema
+include /usr/share/openldap/schema/core.schema
+include /usr/share/openldap/schema/cosine.schema
+include /usr/share/openldap/schema/inetorgperson.schema
 include @l_prefix@/etc/openldap/schema/rfc2739.schema
 include @l_prefix@/etc/openldap/schema/kolab2.schema
 
+include @l_prefix@/etc/openldap/slapd.access
+
+access to * 
+        by self write
+	by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
+ 	by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
+	by * read stop
+
 pidfile		@l_prefix@/var/openldap/run/slapd.pid
 replica-pidfile	@l_prefix@/var/openldap/run/slurpd.pid
 argsfile	@l_prefix@/var/openldap/slapd.args
-replogfile      @l_prefix@/var/openldap/replog
 replicationinterval 5
 
-schemacheck 	       on
+modulepath	/usr/lib/openldap
+moduleload	back_monitor.la
 
 TLSCertificateFile     @l_prefix@/etc/kolab/cert.pem
 TLSCertificateKeyFile  @l_prefix@/etc/kolab/key.pem
@@ -37,26 +45,24 @@
 
 defaultsearchbase      "@@@base_dn@@@"
 
-require 	none
 allow 		bind_v2
 
 loglevel	0
 
-database        monitor
-
 database	bdb
 cachesize       2000
-checkpoint 	512 10
 idlcachesize    10000
 idletimeout     10 # The value can be increased if some clients develop problems.
                    # Please report to kolab-devel@kolab.org if you encounter such a client.
 
 suffix		"@@@base_dn@@@"
+checkpoint 	512 10
 directory	@l_prefix@/var/openldap/openldap-data
 
 rootdn          "@@@bind_dn@@@"
 rootpw          "@@@bind_pw_hash@@@"
 
+replogfile      @l_prefix@/var/openldap/replog
 replica uri=ldap://127.0.0.1:9999
         binddn="cn=replicator"
         bindmethod=simple 
@@ -72,51 +78,45 @@
 index   kolabHomeServer pres,eq
 index   member          pres,eq
 
-include @l_prefix@/etc/openldap/slapd.access
-
 access to dn="@@@base_dn@@@" attrs=children
 	by group/kolabGroupOfNames="cn=domain-maintainer,cn=internal,@@@base_dn@@@" write
 
 access to dn="cn=internal,@@@base_dn@@@" attrs=children
 	by group/kolabGroupOfNames="cn=domain-maintainer,cn=internal,@@@base_dn@@@" write
 
-access to dn.subtree="cn=Monitor"
-        by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
-        by * none stop
-
-access to attr=userPassword
+access to dn.subtree="@@@base_dn@@@" attr=userPassword
    	by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" =wx
         by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" =wx
         by self =wx
         by anonymous =x
         by * none stop
 
-access to attr=mail
+access to dn.subtree="@@@base_dn@@@" attr=mail
         by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
         by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
         by * read stop
 
-access to attr=alias
+access to dn.subtree="@@@base_dn@@@" attr=alias
         by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
         by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
         by * read stop
 
-access to attr=uid
+access to dn.subtree="@@@base_dn@@@" attr=uid
         by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
         by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
         by * read stop
 
-access to attr=cyrus-userquota
+access to dn.subtree="@@@base_dn@@@" attr=cyrus-userquota
         by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
         by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
 	by self read stop
 
-access to attr=kolabHomeServer
+access to dn.subtree="@@@base_dn@@@" attr=kolabHomeServer
         by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
         by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
         by * read stop
 
-access to attr=kolabHomeMTA
+access to dn.subtree="@@@base_dn@@@" attr=kolabHomeMTA
         by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
         by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
         by * read stop
@@ -169,10 +169,11 @@
 	by dn="cn=nobody,cn=internal,@@@base_dn@@@" read 
 	by * none stop	
 
-access to * 
-        by self write
-	by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
- 	by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
-	by * read stop
-
 include @l_prefix@/etc/openldap/slapd.replicas
+
+database        monitor
+
+access to dn.subtree="cn=Monitor"
+        by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
+        by * none stop
+