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 d0aca20d90b8d6f7d89035e1328f587714387d4e..d05d70ae8d10cf7427330ee23134037646f733a4 100644 (file)
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -1,7 +1,7 @@
 /* schemaparse.c - routines to parse config file objectclass definitions */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -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,
@@ -214,20 +210,20 @@ oc_usage( void )
 static void
 at_usage( void )
 {
-       fprintf( stderr,
+       fprintf( stderr, "%s%s%s",
                "AttributeTypeDescription = \"(\" whsp\n"
                "  numericoid whsp      ; AttributeType identifier\n"
                "  [ \"NAME\" qdescrs ]             ; name used in AttributeType\n"
                "  [ \"DESC\" qdstring ]            ; description\n"
                "  [ \"OBSOLETE\" whsp ]\n"
                "  [ \"SUP\" woid ]                 ; derived from this other\n"
-               "                                   ; AttributeType\n"
+               "                                   ; AttributeType\n",
                "  [ \"EQUALITY\" woid ]            ; Matching Rule name\n"
                "  [ \"ORDERING\" woid ]            ; Matching Rule name\n"
                "  [ \"SUBSTR\" woid ]              ; Matching Rule name\n"
                "  [ \"SYNTAX\" whsp noidlen whsp ] ; see section 4.3\n"
                "  [ \"SINGLE-VALUE\" whsp ]        ; default multi-valued\n"
-               "  [ \"COLLECTIVE\" whsp ]          ; default not collective\n"
+               "  [ \"COLLECTIVE\" whsp ]          ; default not collective\n",
                "  [ \"NO-USER-MODIFICATION\" whsp ]; default user modifiable\n"
                "  [ \"USAGE\" whsp AttributeUsage ]; default userApplications\n"
                "                                   ; userApplications\n"