From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 29 May 2000 16:39:16 +0000 (+0000)
Subject: New schema code is now the default.
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2808
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=64f028a6abd4ed064a24507811494954ecb53e63;p=openldap

New schema code is now the default.
Use -DSLAPD_SCHEMA_COMPAT to use 1.x compatible schema (deprecated).
---

diff --git a/include/portable.h.in b/include/portable.h.in
index 0d11d8da55..c2fdf5bf20 100644
--- a/include/portable.h.in
+++ b/include/portable.h.in
@@ -14,6 +14,11 @@
 
 /* end of preamble */
 
+#if !defined( SLAPD_SCHEMA_COMPAT ) && !defined( SLAPD_SCHEMA_NOT_COMPAT )
+	/* use new schema codes */
+#define SLAPD_SCHEMA_NOT_COMPAT 1
+#endif
+
 
 /* Define if on AIX 3.
    System headers sometimes define this.
diff --git a/include/portable.nt b/include/portable.nt
index 7248671e1f..208edae104 100644
--- a/include/portable.nt
+++ b/include/portable.nt
@@ -16,6 +16,11 @@
 
 /* end of preamble */
 
+#if !defined( SLAPD_SCHEMA_COMPAT ) && !defined( SLAPD_SCHEMA_NOT_COMPAT )
+	/* use new schema codes */
+#define SLAPD_SCHEMA_NOT_COMPAT 1
+#endif
+
 /* --------------------------------------------------- */
 /* begin of MSVC5 specific entries */
 
diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index c11f81daa2..7d3c5e4b8e 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -664,6 +664,7 @@ done:
 	*matchp = match;
 	return LDAP_SUCCESS;
 }
+#endif
 
 static int
 NumericStringNormalize(
@@ -720,8 +721,6 @@ NumericStringNormalize(
 	return LDAP_SUCCESS;
 }
 
-#endif
-
 struct syntax_defs_rec {
 	char *sd_desc;
 	int sd_flags;
diff --git a/tests/Makefile.in b/tests/Makefile.in
index c9aca9bd88..84e8928ffe 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -12,7 +12,8 @@ tests: bdb2 ldbm
 
 bdb2: test-bdb2
 test-bdb2:	FORCE
-	@-$(LN_S) $(srcdir)/data . 
+	@-$(LN_S) $(srcdir)/data data
+	@-$(LN_S) $(top_srcdir)/servers/slapd/schema schema 
 	@if test "$(BUILD_BDB2)" = "yes" ; then \
 		echo "Initiating LDAP tests..." ; \
 		$(MKDIR) test-db test-repl || true; \
@@ -23,27 +24,31 @@ test-bdb2:	FORCE
 
 ldbm: test-ldbm
 test-ldbm:	FORCE
-	@-$(LN_S) $(srcdir)/data .
+	@-$(LN_S) $(srcdir)/data data
+	@-$(LN_S) $(top_srcdir)/servers/slapd/schema schema 
 	@echo "Initiating LDAP tests..."
 	@-$(MKDIR) test-db test-repl || true
 	@$(srcdir)/scripts/all $(srcdir) ldbm
 
 passwd: test-passwd
 test-passwd: FORCE
-	@-$(LN_S) $(srcdir)/data .
+	@-$(LN_S) $(srcdir)/data data
+	@-$(LN_S) $(top_srcdir)/servers/slapd/schema schema 
 	@echo "Initiating LDAP tests..."
 	@-$(MKDIR) test-db test-repl || true
 	@$(srcdir)/scripts/passwd-search $(srcdir) passwd
 
 test-nis-schema:        test-nis-schema-ldbm
 test-nis-schema-ldbm:
-	@-$(LN_S) $(srcdir)/data .
+	@-$(LN_S) $(srcdir)/data data
+	@-$(LN_S) $(top_srcdir)/servers/slapd/schema schema 
 	@echo "Initiating LDAP server with NIS schema & ldbm backend..."; \
 	$(MKDIR) test-db test-repl ; \
 	$(srcdir)/scripts/startup_nis_ldap_server.sh $(srcdir) ldbm
 
 test-nis-schema-bdb2:
-	@-$(LN_S) $(srcdir)/data .
+	@-$(LN_S) $(srcdir)/data data
+	@-$(LN_S) $(top_srcdir)/servers/slapd/schema schema 
 	@echo "Initiating LDAP server with NIS schema & DB2 backend..."; \
 	@if test "$(BUILD_BDB2)" = "yes" ; then \
 		echo "Initiating LDAP tests..." ; \
@@ -57,6 +62,6 @@ clean-local:	FORCE
 	-$(RM) test-db/[!C]* test-repl/[!C]* *leak *gmon *core
 
 veryclean-local: FORCE
-	@-$(RM) data
+	@-$(RM) data schema
 	$(RM) -r test-db test-repl
 
diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index c52b970067..8254d750df 100644
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -2,8 +2,12 @@
 #
 # master slapd config -- for testing
 #
-include		./data/slapd.at.conf
-include		./data/slapd.oc.conf
+#include		./data/slapd.at.conf
+#include		./data/slapd.oc.conf
+include ./schema/core.schema
+include ./schema/openldap.schema
+include ./schema/cosine.schema
+include ./schema/inetorgperson.schema
 schemacheck	off
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
diff --git a/tests/data/slapd-dnssrv.conf b/tests/data/slapd-dnssrv.conf
index 5516869e02..dab5812dd1 100644
--- a/tests/data/slapd-dnssrv.conf
+++ b/tests/data/slapd-dnssrv.conf
@@ -2,12 +2,10 @@
 #
 # DNS SRV slapd config -- for testing
 #
-include		./data/slapd.at.conf
-include		./data/slapd.oc.conf
-#include ../../servers/slapd/schema/core.schema
-#include ../../servers/slapd/schema/openldap.schema
-#include ../../servers/slapd/schema/cosine.schema
-#include ../../servers/slapd/schema/inetorgperson.schema
+#include		./data/slapd.at.conf
+#include		./data/slapd.oc.conf
+include ./schema/core.schema
+include ./schema/openldap.schema
 schemacheck	on
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index 3090326939..94b3891e62 100644
--- a/tests/data/slapd-master.conf
+++ b/tests/data/slapd-master.conf
@@ -2,12 +2,12 @@
 #
 # master slapd config -- for testing
 #
-include		./data/slapd.at.conf
-include		./data/slapd.oc.conf
-#include ../../servers/slapd/schema/core.schema
-#include ../../servers/slapd/schema/openldap.schema
-#include ../../servers/slapd/schema/cosine.schema
-#include ../../servers/slapd/schema/inetorgperson.schema
+#include		./data/slapd.at.conf
+#include		./data/slapd.oc.conf
+include ./schema/core.schema
+include ./schema/openldap.schema
+include ./schema/cosine.schema
+include ./schema/inetorgperson.schema
 schemacheck	on
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
diff --git a/tests/data/slapd-passwd.conf b/tests/data/slapd-passwd.conf
index 10925e52d7..66c5496f37 100644
--- a/tests/data/slapd-passwd.conf
+++ b/tests/data/slapd-passwd.conf
@@ -2,8 +2,12 @@
 #
 # master slapd config -- for testing
 #
-include		./data/slapd.at.conf
-include		./data/slapd.oc.conf
+#include		./data/slapd.at.conf
+#include		./data/slapd.oc.conf
+include ./schema/core.schema
+include ./schema/openldap.schema
+include ./schema/cosine.schema
+include ./schema/inetorgperson.schema
 schemacheck	on
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf
index bc8761f26e..f5f7dccf9a 100644
--- a/tests/data/slapd-pw.conf
+++ b/tests/data/slapd-pw.conf
@@ -2,8 +2,12 @@
 #
 # master slapd config -- for testing
 #
-include		./data/slapd.at.conf
-include		./data/slapd.oc.conf
+#include		./data/slapd.at.conf
+#include		./data/slapd.oc.conf
+include ./schema/core.schema
+include ./schema/openldap.schema
+include ./schema/cosine.schema
+include ./schema/inetorgperson.schema
 schemacheck	off
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf
index c10b036a49..7c3c226e4a 100644
--- a/tests/data/slapd-ref-slave.conf
+++ b/tests/data/slapd-ref-slave.conf
@@ -2,9 +2,15 @@
 #
 # slave slapd config -- for default referral testing
 #
-include		./data/slapd.at.conf
-include		./data/slapd.oc.conf
+#include		./data/slapd.at.conf
+#include		./data/slapd.oc.conf
+include ./schema/core.schema
+include ./schema/openldap.schema
+include ./schema/cosine.schema
+include ./schema/inetorgperson.schema
+#
 schemacheck	off
+#
 pidfile     ./test-repl/slapd.pid
 argsfile    ./test-repl/slapd.args
 
diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf
index d4f702f78b..b336e435fa 100644
--- a/tests/data/slapd-repl-master.conf
+++ b/tests/data/slapd-repl-master.conf
@@ -2,9 +2,15 @@
 #
 # master slapd config -- for testing of replication
 #
-include		./data/slapd.at.conf
-include		./data/slapd.oc.conf
+#include		./data/slapd.at.conf
+#include		./data/slapd.oc.conf
+include ./schema/core.schema
+include ./schema/openldap.schema
+include ./schema/cosine.schema
+include ./schema/inetorgperson.schema
+#
 schemacheck	off
+#
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
 
diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf
index e9f0bb3ee7..02a575f5b0 100644
--- a/tests/data/slapd-repl-slave.conf
+++ b/tests/data/slapd-repl-slave.conf
@@ -2,8 +2,13 @@
 #
 # master slapd config -- for testing of replication
 #
-include		./data/slapd.at.conf
-include		./data/slapd.oc.conf
+#include		./data/slapd.at.conf
+#include		./data/slapd.oc.conf
+include ./schema/core.schema
+include ./schema/openldap.schema
+include ./schema/cosine.schema
+include ./schema/inetorgperson.schema
+#
 schemacheck	off
 pidfile     ./test-repl/slapd.pid
 argsfile    ./test-repl/slapd.args