summaryrefslogtreecommitdiffstats
path: root/ldap/admin
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2009-09-29 16:55:32 -0600
committerRich Megginson <rmeggins@redhat.com>2009-09-29 19:50:36 -0600
commitde006310079abf5c93caed26d33455e22d7c7eb4 (patch)
tree188745e67bf33e0432d24307e1360d8c96a55aa3 /ldap/admin
parent675508c6b5482161510514055d0d42006471551b (diff)
downloadds-de006310079abf5c93caed26d33455e22d7c7eb4.tar.gz
ds-de006310079abf5c93caed26d33455e22d7c7eb4.tar.xz
ds-de006310079abf5c93caed26d33455e22d7c7eb4.zip
Config schema not included in core schema
https://bugzilla.redhat.com/show_bug.cgi?id=520921 Resolves: bug 520921 Bug Description: Config schema not included in core schema Reviewed by: nkinder (Thanks!) Fix Description: Just had to move a few schema from 02common and 30ns-common into 01core389.ldif. I also added 01core389.ldif to the list of schema installed when install_full_schema=0 is specified with setup-ds.pl. I also added these schema files to the list of schema files to upgrade. With these changes, the server starts up fine. The only error is this: [29/Sep/2009:16:47:53 -0600] - Entry "cn=PAM Pass Through Auth,cn=plugins,cn=config" has unknown object class "pamConfig" This is because the pam pass through plugin is included in the default config. I'd rather not move that schema file. That plugin can be removed from the default config during setup by specifying a slapd.ConfigFile directive with contents like this: dn: cn=PAM Pass Through Auth,cn=plugins,cn=config changetype: delete Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no
Diffstat (limited to 'ldap/admin')
-rw-r--r--ldap/admin/src/scripts/60upgradeschemafiles.pl2
-rw-r--r--ldap/admin/src/scripts/DSCreate.pm.in3
2 files changed, 3 insertions, 2 deletions
diff --git a/ldap/admin/src/scripts/60upgradeschemafiles.pl b/ldap/admin/src/scripts/60upgradeschemafiles.pl
index b0f57580..c1b1bb7c 100644
--- a/ldap/admin/src/scripts/60upgradeschemafiles.pl
+++ b/ldap/admin/src/scripts/60upgradeschemafiles.pl
@@ -10,7 +10,7 @@ sub runinst {
# these schema files are obsolete, or we want to replace
# them with newer versions
- my @toremove = qw(00core.ldif 01common.ldif 05rfc2247.ldif 10presence.ldif 28pilot.ldif 50ns-directory.ldif 60mozilla.ldif);
+ my @toremove = qw(00core.ldif 01core389.ldif 01common.ldif 02common.ldif 05rfc2247.ldif 10presence.ldif 28pilot.ldif 30ns-common.ldif 50ns-directory.ldif 60mozilla.ldif);
# make a backup directory to store the deleted schema, then
# don't really delete it, just move it to that directory
diff --git a/ldap/admin/src/scripts/DSCreate.pm.in b/ldap/admin/src/scripts/DSCreate.pm.in
index f351a21b..96930dfd 100644
--- a/ldap/admin/src/scripts/DSCreate.pm.in
+++ b/ldap/admin/src/scripts/DSCreate.pm.in
@@ -493,7 +493,8 @@ sub installSchema {
$inf->{slapd}->{install_full_schema}) {
push @schemafiles, glob("$inf->{General}->{prefix}@schemadir@/*");
} else {
- push @schemafiles, "$inf->{General}->{prefix}@schemadir@/00core.ldif";
+ push @schemafiles, "$inf->{General}->{prefix}@schemadir@/00core.ldif",
+ "$inf->{General}->{prefix}@schemadir@/01core389.ldif";
}
# additional schema files