Berkeley DB 4.2 support (DB 4.2 required by default)

[openldap] / servers / slapd / schemaparse.c

diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index 8eeba03d4d810f56f87bbe2ac25977f4052dcda3..d05d70ae8d10cf7427330ee23134037646f733a4 100644 (file)
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -45,7 +45,7 @@ static char *const err2text[] = {
        "OID could not be expanded",
        "Duplicate Content Rule",
        "Content Rule not for STRUCTURAL object class",
-       "Content Rule AUX contains non-AUXILIARY object class"
+       "Content Rule AUX contains inappropriate object class",
        "Content Rule attribute type list contains duplicate"
 };
 
@@ -96,8 +96,6 @@ dscompare(const char *s1, const char *s2, char delim)
        return 0;
 }
 
-#ifdef SLAP_EXTENDED_SCHEMA
-
 static void
 cr_usage( void )
 {
@@ -153,8 +151,6 @@ parse_cr(
        return 0;
 }
 
-#endif
-
 int
 parse_oc(
     const char *fname,