document option '-F'

[openldap] / servers / slapd / schemaparse.c

diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index 6a621937f3eca4d02e3c977e255b190e0195bed4..16addf4a16029a93b3c64d811e1bb8b46214c044 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-2005 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"
@@ -17,7 +26,6 @@
 #include "ldap_schema.h"
 
 int    global_schemacheck = 1; /* schemacheck ON is default */
-int    global_add_rdn_values = 0; /* bail out if rdn values do not match entry values is default */
 
 static void            oc_usage(void); 
 static void            at_usage(void);
@@ -46,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"
 };
 
@@ -97,8 +105,6 @@ dscompare(const char *s1, const char *s2, char delim)
        return 0;
 }
 
-#ifdef SLAP_EXTENDED_SCHEMA
-
 static void
 cr_usage( void )
 {
@@ -120,8 +126,8 @@ parse_cr(
     const char *fname,
     int                lineno,
     char       *line,
-    char       **argv
-)
+    char       **argv,
+       ContentRule **scr )
 {
        LDAPContentRule *cr;
        int             code;
@@ -143,7 +149,7 @@ parse_cr(
                return 1;
        }
 
-       code = cr_add(cr,1,&err);
+       code = cr_add(cr,1,scr,&err);
        if ( code ) {
                fprintf( stderr, "%s: line %d: %s: \"%s\"\n",
                         fname, lineno, scherr2str(code), err);
@@ -154,15 +160,13 @@ parse_cr(
        return 0;
 }
 
-#endif
-
 int
 parse_oc(
     const char *fname,
     int                lineno,
     char       *line,
-    char       **argv
-)
+    char       **argv,
+       ObjectClass **soc )
 {
        LDAPObjectClass *oc;
        int             code;
@@ -184,7 +188,7 @@ parse_oc(
                return 1;
        }
 
-       code = oc_add(oc,1,&err);
+       code = oc_add(oc,1,soc,&err);
        if ( code ) {
                fprintf( stderr, "%s: line %d: %s: \"%s\"\n",
                         fname, lineno, scherr2str(code), err);
@@ -215,20 +219,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"
@@ -243,8 +247,8 @@ parse_at(
     const char *fname,
     int                lineno,
     char       *line,
-    char       **argv
-)
+    char       **argv,
+       AttributeType **sat )
 {
        LDAPAttributeType *at;
        int             code;
@@ -273,7 +277,7 @@ parse_at(
                return 1;
        }
 
-       code = at_add(at,&err);
+       code = at_add(at,1,sat,&err);
        if ( code ) {
                fprintf( stderr, "%s: line %d: %s: \"%s\"\n",
                         fname, lineno, scherr2str(code), err);