This is an automated email from the git hooks/post-receive script.
firstyear pushed a commit to branch master
in repository 389-ds-base.
commit 391aad7f50188e325450ea213b3b1d242c4205ab
Author: William Brown <firstyear(a)redhat.com>
Date: Fri Sep 1 11:45:19 2017 +1000
Ticket 49371 - Template dse.ldif did not contain all needed plugins
Bug Description: setup-ds.pl would use a set of ldif files
rather than the single template-dse.ldif. Rather than duplicate
this behaviour in teh python tools, we move their content to
template-dse.ldif to make everything consistent.
Fix Description: Remove a number of unneeded ldifs and roll
them into template-dse.ldif.
https://pagure.io/389-ds-base/issue/49371
Author: wibrown
Review by: mreynolds (Thanks!)
---
Makefile.am | 4 --
ldap/admin/src/scripts/DSCreate.pm.in | 19 -------
ldap/ldif/50posix-winsync-plugin.ldif | 21 --------
ldap/ldif/50replication-plugins.ldif | 14 -----
ldap/ldif/90betxn-plugins.ldif | 0
ldap/ldif/template-bitwise.ldif.in | 14 -----
ldap/ldif/template-dnaplugin.ldif.in | 12 -----
ldap/ldif/template-dse.ldif.in | 99 +++++++++++++++++++++++++++++++++++
ldap/ldif/template-pampta.ldif.in | 24 ---------
ldap/ldif/template-sasl.ldif.in | 26 ---------
10 files changed, 99 insertions(+), 134 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 89b16ea..425c71d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -622,9 +622,6 @@ sampledata_DATA = ldap/admin/src/scripts/DSSharedLib \
ldap/ldif/template-ldapi.ldif \
ldap/ldif/template-ldapi-default.ldif \
ldap/ldif/template-ldapi-autobind.ldif \
- ldap/ldif/template-pampta.ldif \
- ldap/ldif/template-dnaplugin.ldif \
- ldap/ldif/template-bitwise.ldif \
ldap/ldif/template-org.ldif \
ldap/ldif/template-domain.ldif \
ldap/ldif/template-state.ldif \
@@ -633,7 +630,6 @@ sampledata_DATA = ldap/admin/src/scripts/DSSharedLib \
ldap/ldif/template-orgunit.ldif \
ldap/ldif/template-baseacis.ldif \
ldap/ldif/template-sasl.ldif \
- ldap/ldif/90betxn-plugins.ldif \
$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-FamilyNames \
$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-GivenNames \
$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-OrgUnits \
diff --git a/ldap/admin/src/scripts/DSCreate.pm.in
b/ldap/admin/src/scripts/DSCreate.pm.in
index 7e98803..71db353 100644
--- a/ldap/admin/src/scripts/DSCreate.pm.in
+++ b/ldap/admin/src/scripts/DSCreate.pm.in
@@ -376,25 +376,6 @@ sub createConfigFile {
my @ldiffiles =
("$inf->{General}->{prefix}@templatedir(a)/template-dse.ldif",
"$inf->{General}->{prefix}@templatedir(a)/template-suffix-db.ldif",
"$inf->{General}->{prefix}@templatedir(a)/template-sasl.ldif");
- if ("@enable_pam_passthru@") {
- push @ldiffiles,
"$inf->{General}->{prefix}@templatedir(a)/template-pampta.ldif";
- }
- if ("@enable_bitwise@") {
- push @ldiffiles,
"$inf->{General}->{prefix}@templatedir(a)/template-bitwise.ldif";
- }
- if ("@enable_dna@") {
- push @ldiffiles,
"$inf->{General}->{prefix}@templatedir(a)/template-dnaplugin.ldif";
- }
- if (-f
"$inf->{General}->{prefix}@updatedir(a)/50replication-plugins.ldif") {
- push @ldiffiles,
"$inf->{General}->{prefix}@updatedir(a)/50replication-plugins.ldif";
- }
- if (-f
"$inf->{General}->{prefix}@updatedir(a)/50posix-winsync-plugin.ldif") {
- push @ldiffiles,
"$inf->{General}->{prefix}@updatedir(a)/50posix-winsync-plugin.ldif";
- }
-
- if (-f "$inf->{General}->{prefix}@templatedir(a)/90betxn-plugins.ldif")
{
- push @ldiffiles,
"$inf->{General}->{prefix}@templatedir(a)/90betxn-plugins.ldif";
- }
# additional configuration LDIF files
if (exists($inf->{slapd}->{ConfigFile})) {
diff --git a/ldap/ldif/50posix-winsync-plugin.ldif
b/ldap/ldif/50posix-winsync-plugin.ldif
deleted file mode 100644
index 17dc243..0000000
--- a/ldap/ldif/50posix-winsync-plugin.ldif
+++ /dev/null
@@ -1,21 +0,0 @@
-dn: cn=Posix Winsync API,cn=plugins,cn=config
-objectclass: top
-objectclass: nsSlapdPlugin
-objectclass: extensibleObject
-cn: Posix Winsync API
-nsslapd-pluginpath: libposix-winsync-plugin
-nsslapd-plugininitfunc: posix_winsync_plugin_init
-nsslapd-plugintype: preoperation
-nsslapd-pluginenabled: off
-nsslapd-plugin-depends-on-type: database
-posixWinsyncMsSFUSchema: false
-posixWinsyncMapMemberUID: true
-posixWinsyncMapNestedGrouping: false
-posixWinsyncCreateMemberOfTask: false
-posixWinsyncLowerCaseUID: false
-nsslapd-pluginprecedence: 25
-# these will be replaced when the server loads the plugin
-nsslapd-pluginId: ID
-nsslapd-pluginVersion: PACKAGE_VERSION
-nsslapd-pluginVendor: VENDOR
-nsslapd-pluginDescription: DESC
diff --git a/ldap/ldif/50replication-plugins.ldif b/ldap/ldif/50replication-plugins.ldif
deleted file mode 100644
index 2a978be..0000000
--- a/ldap/ldif/50replication-plugins.ldif
+++ /dev/null
@@ -1,14 +0,0 @@
-dn: cn=Multimaster Replication Plugin,cn=plugins,cn=config
-objectclass: top
-objectclass: nsSlapdPlugin
-objectclass: extensibleObject
-cn: Multimaster Replication Plugin
-nsslapd-pluginpath: libreplication-plugin
-nsslapd-plugininitfunc: replication_multimaster_plugin_init
-nsslapd-plugintype: object
-nsslapd-pluginbetxn: on
-nsslapd-pluginenabled: on
-nsslapd-plugin-depends-on-named: ldbm database
-nsslapd-plugin-depends-on-named: AES
-nsslapd-plugin-depends-on-named: Class of Service
-
diff --git a/ldap/ldif/90betxn-plugins.ldif b/ldap/ldif/90betxn-plugins.ldif
deleted file mode 100644
index e69de29..0000000
diff --git a/ldap/ldif/template-bitwise.ldif.in b/ldap/ldif/template-bitwise.ldif.in
deleted file mode 100644
index e9e42f6..0000000
--- a/ldap/ldif/template-bitwise.ldif.in
+++ /dev/null
@@ -1,14 +0,0 @@
-dn: cn=Bitwise Plugin,cn=plugins,cn=config
-objectClass: top
-objectClass: nsSlapdPlugin
-objectClass: extensibleObject
-cn: Bitwise Plugin
-nsslapd-pluginPath: libbitwise-plugin
-nsslapd-pluginInitfunc: bitwise_init
-nsslapd-pluginType: matchingRule
-nsslapd-pluginEnabled: on
-# these will be replaced when the server loads the plugin
-nsslapd-pluginId: ID
-nsslapd-pluginVersion: PACKAGE_VERSION
-nsslapd-pluginVendor: VENDOR
-nsslapd-pluginDescription: DESC
diff --git a/ldap/ldif/template-dnaplugin.ldif.in b/ldap/ldif/template-dnaplugin.ldif.in
deleted file mode 100644
index 61b317a..0000000
--- a/ldap/ldif/template-dnaplugin.ldif.in
+++ /dev/null
@@ -1,12 +0,0 @@
-dn: cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config
-objectclass: top
-objectclass: nsSlapdPlugin
-objectclass: extensibleObject
-objectclass: nsContainer
-cn: Distributed Numeric Assignment Plugin
-nsslapd-plugininitfunc: dna_init
-nsslapd-plugintype: bepreoperation
-nsslapd-pluginenabled: off
-nsslapd-pluginPath: libdna-plugin
-nsslapd-plugin-depends-on-type: database
-
diff --git a/ldap/ldif/template-dse.ldif.in b/ldap/ldif/template-dse.ldif.in
index b6e09a6..3107903 100644
--- a/ldap/ldif/template-dse.ldif.in
+++ b/ldap/ldif/template-dse.ldif.in
@@ -682,6 +682,16 @@ nsslapd-plugintype: betxnpreoperation
nsslapd-pluginenabled: on
nsslapd-plugin-depends-on-type: database
+dn: cn=Bitwise Plugin,cn=plugins,cn=config
+objectClass: top
+objectClass: nsSlapdPlugin
+objectClass: extensibleObject
+cn: Bitwise Plugin
+nsslapd-pluginPath: libbitwise-plugin
+nsslapd-pluginInitfunc: bitwise_init
+nsslapd-pluginType: matchingRule
+nsslapd-pluginEnabled: on
+
dn: cn=Content Synchronization,cn=plugins,cn=config
objectclass: top
objectclass: nsSlapdPlugin
@@ -707,6 +717,18 @@ nsslapd-plugintype: preoperation
nsslapd-pluginenabled: on
nsslapd-plugin-depends-on-type: database
+dn: cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config
+objectclass: top
+objectclass: nsSlapdPlugin
+objectclass: extensibleObject
+objectclass: nsContainer
+cn: Distributed Numeric Assignment Plugin
+nsslapd-plugininitfunc: dna_init
+nsslapd-plugintype: bepreoperation
+nsslapd-pluginenabled: off
+nsslapd-pluginPath: libdna-plugin
+nsslapd-plugin-depends-on-type: database
+
dn: cn=Internationalization Plugin,cn=plugins,cn=config
objectclass: top
objectclass: nsSlapdPlugin
@@ -753,6 +775,40 @@ nsslapd-plugintype: betxnpreoperation
nsslapd-pluginenabled: on
nsslapd-plugin-depends-on-type: database
+dn: cn=Multimaster Replication Plugin,cn=plugins,cn=config
+objectclass: top
+objectclass: nsSlapdPlugin
+objectclass: extensibleObject
+cn: Multimaster Replication Plugin
+nsslapd-pluginpath: libreplication-plugin
+nsslapd-plugininitfunc: replication_multimaster_plugin_init
+nsslapd-plugintype: object
+nsslapd-pluginbetxn: on
+nsslapd-pluginenabled: on
+nsslapd-plugin-depends-on-named: ldbm database
+nsslapd-plugin-depends-on-named: AES
+nsslapd-plugin-depends-on-named: Class of Service
+
+dn: cn=PAM Pass Through Auth,cn=plugins,cn=config
+objectclass: top
+objectclass: nsSlapdPlugin
+objectclass: extensibleObject
+objectclass: pamConfig
+cn: PAM Pass Through Auth
+nsslapd-pluginpath: libpam-passthru-plugin
+nsslapd-plugininitfunc: pam_passthruauth_init
+nsslapd-plugintype: betxnpreoperation
+nsslapd-pluginenabled: off
+nsslapd-pluginLoadGlobal: true
+nsslapd-plugin-depends-on-type: database
+pamMissingSuffix: ALLOW
+pamExcludeSuffix: cn=config
+pamIDMapMethod: RDN
+pamIDAttr: notUsedWithRDNMethod
+pamFallback: FALSE
+pamSecure: TRUE
+pamService: ldapserver
+
dn: cn=Pass Through Authentication,cn=plugins,cn=config
objectclass: top
objectclass: nsSlapdPlugin
@@ -764,6 +820,23 @@ nsslapd-plugintype: preoperation
nsslapd-pluginenabled: off
nsslapd-plugin-depends-on-type: database
+dn: cn=Posix Winsync API,cn=plugins,cn=config
+objectclass: top
+objectclass: nsSlapdPlugin
+objectclass: extensibleObject
+cn: Posix Winsync API
+nsslapd-pluginpath: libposix-winsync-plugin
+nsslapd-plugininitfunc: posix_winsync_plugin_init
+nsslapd-plugintype: preoperation
+nsslapd-pluginenabled: off
+nsslapd-plugin-depends-on-type: database
+posixWinsyncMsSFUSchema: false
+posixWinsyncMapMemberUID: true
+posixWinsyncMapNestedGrouping: false
+posixWinsyncCreateMemberOfTask: false
+posixWinsyncLowerCaseUID: false
+nsslapd-pluginprecedence: 25
+
dn: cn=USN,cn=plugins,cn=config
objectclass: top
objectclass: nsSlapdPlugin
@@ -1062,3 +1135,29 @@ objectClass: extensibleObject
cn: config
alwaysrecordlogin: no
+dn: cn=sasl,cn=config
+objectClass: top
+objectClass: nsContainer
+cn: sasl
+
+dn: cn=mapping,cn=sasl,cn=config
+objectClass: top
+objectClass: nsContainer
+cn: mapping
+
+dn: cn=Kerberos uid mapping,cn=mapping,cn=sasl,cn=config
+objectClass: top
+objectClass: nsSaslMapping
+cn: Kerberos uid mapping
+nsSaslMapRegexString: \(.*\)(a)\(.*\)\.\(.*\)
+nsSaslMapBaseDNTemplate: dc=\2,dc=\3
+nsSaslMapFilterTemplate: (uid=\1)
+
+dn: cn=rfc 2829 dn syntax,cn=mapping,cn=sasl,cn=config
+objectClass: top
+objectClass: nsSaslMapping
+cn: rfc 2829 dn syntax
+nsSaslMapRegexString: ^dn:\(.*\)
+nsSaslMapBaseDNTemplate: \1
+nsSaslMapFilterTemplate: (objectclass=*)
+
diff --git a/ldap/ldif/template-pampta.ldif.in b/ldap/ldif/template-pampta.ldif.in
deleted file mode 100644
index 9e8f38b..0000000
--- a/ldap/ldif/template-pampta.ldif.in
+++ /dev/null
@@ -1,24 +0,0 @@
-dn: cn=PAM Pass Through Auth,cn=plugins,cn=config
-objectclass: top
-objectclass: nsSlapdPlugin
-objectclass: extensibleObject
-objectclass: pamConfig
-cn: PAM Pass Through Auth
-nsslapd-pluginpath: libpam-passthru-plugin
-nsslapd-plugininitfunc: pam_passthruauth_init
-nsslapd-plugintype: betxnpreoperation
-nsslapd-pluginenabled: off
-nsslapd-pluginLoadGlobal: true
-nsslapd-plugin-depends-on-type: database
-pamMissingSuffix: ALLOW
-pamExcludeSuffix: cn=config
-pamIDMapMethod: RDN
-pamIDAttr: notUsedWithRDNMethod
-pamFallback: FALSE
-pamSecure: TRUE
-pamService: ldapserver
-# these will be replaced when the server loads the plugin
-nsslapd-pluginId: ID
-nsslapd-pluginVersion: PACKAGE_VERSION
-nsslapd-pluginVendor: VENDOR
-nsslapd-pluginDescription: DESC
diff --git a/ldap/ldif/template-sasl.ldif.in b/ldap/ldif/template-sasl.ldif.in
index c942181..91659e1 100644
--- a/ldap/ldif/template-sasl.ldif.in
+++ b/ldap/ldif/template-sasl.ldif.in
@@ -1,30 +1,4 @@
# replace the Suffix token with your suffix e.g. dc=example,dc=com
-dn: cn=sasl,cn=config
-objectClass: top
-objectClass: nsContainer
-cn: sasl
-
-dn: cn=mapping,cn=sasl,cn=config
-objectClass: top
-objectClass: nsContainer
-cn: mapping
-
-dn: cn=Kerberos uid mapping,cn=mapping,cn=sasl,cn=config
-objectClass: top
-objectClass: nsSaslMapping
-cn: Kerberos uid mapping
-nsSaslMapRegexString: \(.*\)(a)\(.*\)\.\(.*\)
-nsSaslMapBaseDNTemplate: dc=\2,dc=\3
-nsSaslMapFilterTemplate: (uid=\1)
-
-dn: cn=rfc 2829 dn syntax,cn=mapping,cn=sasl,cn=config
-objectClass: top
-objectClass: nsSaslMapping
-cn: rfc 2829 dn syntax
-nsSaslMapRegexString: ^dn:\(.*\)
-nsSaslMapBaseDNTemplate: \1
-nsSaslMapFilterTemplate: (objectclass=*)
-
dn: cn=rfc 2829 u syntax,cn=mapping,cn=sasl,cn=config
objectClass: top
objectClass: nsSaslMapping
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.