--- a/components/openldap/openldap.p5m	Fri May 29 13:29:35 2015 -0700
+++ b/components/openldap/openldap.p5m	Tue Jun 02 08:44:37 2015 +0100
@@ -559,10 +559,12 @@
 file path=usr/share/man/man8oldap/slapschema.8oldap
 file path=usr/share/man/man8oldap/slaptest.8oldap
 dir  path=var
-dir  path=var/openldap
-dir  path=var/openldap/openldap-data
+dir  path=var/openldap owner=openldap group=openldap
+dir  path=var/openldap/openldap-data owner=openldap group=openldap mode=700
+file var/openldap/openldap-data/DB_CONFIG.example \
+    path=var/openldap/openldap-data/DB_CONFIG overlay=allow preserve=true
 file path=var/openldap/openldap-data/DB_CONFIG.example
-dir  path=var/openldap/run
+dir  path=var/openldap/run owner=openldap group=openldap mode=700
 group groupname=openldap gid=75
 user username=openldap ftpuser=false gcos-field="OpenLDAP User" group=openldap \
     uid=75