15857036 pkg contents: slapd.conf overlay=allow requested s11u1-sru
authorVladimir Marek <Vladimir.Marek@oracle.com>
Wed, 06 Nov 2013 22:31:34 +0100
branchs11u1-sru
changeset 2820 cdf3fd6228bc
parent 2800 663f38ad85e5
child 2829 e72361a078b7
15857036 pkg contents: slapd.conf overlay=allow requested
components/openldap/openldap.p5m
--- a/components/openldap/openldap.p5m	Wed Oct 23 00:50:21 2013 -0700
+++ b/components/openldap/openldap.p5m	Wed Nov 06 22:31:34 2013 +0100
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -83,7 +83,7 @@
 dir path=var/openldap/openldap-data
 dir path=var/openldap/run
 file path=etc/openldap/DB_CONFIG.example
-file path=etc/openldap/ldap.conf mode=0644 owner=root group=openldap preserve=true
+file path=etc/openldap/ldap.conf mode=0644 owner=root group=openldap preserve=true overlay=allow
 file path=etc/openldap/ldap.conf.default
 file path=etc/openldap/schema/README
 file path=etc/openldap/schema/collective.schema
@@ -105,7 +105,7 @@
 file path=etc/openldap/schema/openldap.schema
 file path=etc/openldap/schema/pmi.schema
 file path=etc/openldap/schema/ppolicy.schema
-file path=etc/openldap/slapd.conf mode=0640 owner=root group=openldap preserve=true
+file path=etc/openldap/slapd.conf mode=0640 owner=root group=openldap preserve=true overlay=allow
 file path=etc/openldap/slapd.conf.default
 file Solaris/exec_attr path=etc/security/exec_attr.d/library:openldap
 file Solaris/prof_attr path=etc/security/prof_attr.d/library:openldap