[Fedora-directory-commits] ldapserver Makefile.am, 1.72, 1.73 aclocal.m4, 1.73, 1.74 configure, 1.90, 1.91 missing, 1.55, 1.56 install-sh, 1.55, 1.56 depcomp, 1.55, 1.56 compile, 1.50, 1.51 Makefile.in, 1.95, 1.96 config.sub, 1.54, 1.55 config.guess, 1.54, 1.55

Richard Allen Megginson rmeggins at fedoraproject.org
Thu Oct 16 16:43:40 UTC 2008


Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18141/ldapserver

Modified Files:
	Makefile.am aclocal.m4 configure missing install-sh depcomp 
	compile Makefile.in config.sub config.guess 
Log Message:
Resolves: bug 455026 bug 441026
Bug Description: RFE: include RFC4876 schema - Autofs does not include
LDAP schema for Fedora Directory Server
Reviewed by: nkinder (Thanks!)
Fix Description: Pieter D.J. Krul has contributed many schema files that
have been tested in production environments.  They are divided into two
groups - those that conflict with existing schema in DS, CertSys, and
IPA, and those which do not.  The latter are installed in the default
schema directory to be available for new instances - the former are
installed in the data directory just as the rfc2307bis schema.  The
schema provided cover autofs and rfc4876, as in the bug reports, and
more.  Here is the full list of new files:
60trust.ldif 60pureftpd.ldif 60sudo.ldif 60nis.ldif 60samba.ldif
60mozilla.ldif
60samba3.ldif 60krb5kdc.ldif 60sabayon.ldif 60kerberos.ldif
60rfc4876.ldif 60inetmail.ldif 60rfc3712.ldif 60eduperson.ldif
60rfc2739.ldif 60changelog.ldif 60radius.ldif 60autofs.ldif 60qmail.ldif
Platforms tested: RHEL5
Flag Day: no
Doc impact: yes - document the new schema



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- Makefile.am	15 Jul 2008 15:50:55 -0000	1.72
+++ Makefile.am	16 Oct 2008 16:43:36 -0000	1.73
@@ -158,6 +158,11 @@
 config_DATA = $(srcdir)/lib/ldaputil/certmap.conf \
 	$(srcdir)/ldap/schema/slapd-collations.conf
 
+# the schema files in this list are either not
+# standard schema, not tested, or not compatible
+# with the default schema e.g. there is
+# considerable overlap of 60changelog.ldif and 01common.ldif
+# and 60inetmail.ldif and 50ns-mail.ldif among others
 sampledata_DATA = $(srcdir)/ldap/ldif/Ace.ldif \
 	$(srcdir)/ldap/ldif/European.ldif \
 	$(srcdir)/ldap/ldif/Eurosuffix.ldif \
@@ -184,7 +189,17 @@
 	$(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 \
-	$(srcdir)/ldap/schema/10rfc2307bis.ldif
+	$(srcdir)/ldap/schema/10rfc2307bis.ldif \
+	$(srcdir)/ldap/schema/60changelog.ldif \
+	$(srcdir)/ldap/schema/60inetmail.ldif \
+	$(srcdir)/ldap/schema/60krb5kdc.ldif \
+	$(srcdir)/ldap/schema/60kerberos.ldif \
+	$(srcdir)/ldap/schema/60nis.ldif \
+	$(srcdir)/ldap/schema/60qmail.ldif \
+	$(srcdir)/ldap/schema/60radius.ldif \
+	$(srcdir)/ldap/schema/60rfc4876.ldif \
+	$(srcdir)/ldap/schema/60samba.ldif \
+	$(srcdir)/ldap/schema/60samba3.ldif
 
 schema_DATA = $(srcdir)/ldap/schema/00core.ldif \
 	$(srcdir)/ldap/schema/01common.ldif \
@@ -203,6 +218,15 @@
 	$(srcdir)/ldap/schema/50ns-value.ldif \
 	$(srcdir)/ldap/schema/50ns-web.ldif \
 	$(srcdir)/ldap/schema/60pam-plugin.ldif \
+	$(srcdir)/ldap/schema/60autofs.ldif \
+	$(srcdir)/ldap/schema/60eduperson.ldif \
+	$(srcdir)/ldap/schema/60mozilla.ldif \
+	$(srcdir)/ldap/schema/60pureftpd.ldif \
+	$(srcdir)/ldap/schema/60rfc2739.ldif \
+	$(srcdir)/ldap/schema/60rfc3712.ldif \
+	$(srcdir)/ldap/schema/60sabayon.ldif \
+	$(srcdir)/ldap/schema/60sudo.ldif \
+	$(srcdir)/ldap/schema/60trust.ldif \
 	$(srcdir)/ldap/schema/99user.ldif
 
 sbin_SCRIPTS = ldap/admin/src/scripts/setup-ds.pl \














Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- Makefile.in	13 Oct 2008 16:32:42 -0000	1.95
+++ Makefile.in	16 Oct 2008 16:43:37 -0000	1.96
@@ -1091,6 +1091,12 @@
 config_DATA = $(srcdir)/lib/ldaputil/certmap.conf \
 	$(srcdir)/ldap/schema/slapd-collations.conf
 
+
+# the schema files in this list are either not
+# standard schema, not tested, or not compatible
+# with the default schema e.g. there is
+# considerable overlap of 60changelog.ldif and 01common.ldif
+# and 60inetmail.ldif and 50ns-mail.ldif among others
 sampledata_DATA = $(srcdir)/ldap/ldif/Ace.ldif \
 	$(srcdir)/ldap/ldif/European.ldif \
 	$(srcdir)/ldap/ldif/Eurosuffix.ldif \
@@ -1117,7 +1123,17 @@
 	$(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 \
-	$(srcdir)/ldap/schema/10rfc2307bis.ldif
+	$(srcdir)/ldap/schema/10rfc2307bis.ldif \
+	$(srcdir)/ldap/schema/60changelog.ldif \
+	$(srcdir)/ldap/schema/60inetmail.ldif \
+	$(srcdir)/ldap/schema/60krb5kdc.ldif \
+	$(srcdir)/ldap/schema/60kerberos.ldif \
+	$(srcdir)/ldap/schema/60nis.ldif \
+	$(srcdir)/ldap/schema/60qmail.ldif \
+	$(srcdir)/ldap/schema/60radius.ldif \
+	$(srcdir)/ldap/schema/60rfc4876.ldif \
+	$(srcdir)/ldap/schema/60samba.ldif \
+	$(srcdir)/ldap/schema/60samba3.ldif
 
 schema_DATA = $(srcdir)/ldap/schema/00core.ldif \
 	$(srcdir)/ldap/schema/01common.ldif \
@@ -1136,6 +1152,15 @@
 	$(srcdir)/ldap/schema/50ns-value.ldif \
 	$(srcdir)/ldap/schema/50ns-web.ldif \
 	$(srcdir)/ldap/schema/60pam-plugin.ldif \
+	$(srcdir)/ldap/schema/60autofs.ldif \
+	$(srcdir)/ldap/schema/60eduperson.ldif \
+	$(srcdir)/ldap/schema/60mozilla.ldif \
+	$(srcdir)/ldap/schema/60pureftpd.ldif \
+	$(srcdir)/ldap/schema/60rfc2739.ldif \
+	$(srcdir)/ldap/schema/60rfc3712.ldif \
+	$(srcdir)/ldap/schema/60sabayon.ldif \
+	$(srcdir)/ldap/schema/60sudo.ldif \
+	$(srcdir)/ldap/schema/60trust.ldif \
 	$(srcdir)/ldap/schema/99user.ldif
 
 sbin_SCRIPTS = ldap/admin/src/scripts/setup-ds.pl \








More information about the Fedora-directory-commits mailing list