ITS#2888 don't return LDAP_SIZELIMIT_EXCEEDED prematurely

[openldap] / servers / slapd / schemaparse.c

diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index 8eeba03d4d810f56f87bbe2ac25977f4052dcda3..7f2611f1ee1a764be16b5e810d87083378ae914f 100644 (file)
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -1,8 +1,17 @@
 /* schemaparse.c - routines to parse config file objectclass definitions */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -45,7 +54,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 +105,6 @@ dscompare(const char *s1, const char *s2, char delim)
        return 0;
 }
 
-#ifdef SLAP_EXTENDED_SCHEMA
-
 static void
 cr_usage( void )
 {
@@ -153,8 +160,6 @@ parse_cr(
        return 0;
 }
 
-#endif
-
 int
 parse_oc(
     const char *fname,