Let the caller decide how liberal the schema parsing routines will be.

Most flags do nothing yet.

diff --git a/include/ldap_schema.h b/include/ldap_schema.h
index ec766110c51e0d6c50a53da98f419146eda830c7..ec29616445569f1d2d3d1e58eec3d5db2bf9ad8b 100644 (file)
--- a/include/ldap_schema.h
+++ b/include/ldap_schema.h
@@ -40,6 +40,7 @@ typedef struct ldap_schema_extension_item {
 
 typedef struct ldap_syntax {
        char *syn_oid;          /* REQUIRED */
+       char **syn_names;       /* OPTIONAL */
        char *syn_desc;         /* OPTIONAL */
        LDAP_SCHEMA_EXTENSION_ITEM **syn_extensions; /* OPTIONAL */
 } LDAP_SYNTAX;
@@ -96,6 +97,16 @@ typedef struct ldap_objectclass {
 #define LDAP_SCHEMA_STRUCTURAL                 1
 #define LDAP_SCHEMA_AUXILIARY                  2
 
+/*
+ * Flags that control how liberal the parsing routines are.
+ */
+#define LDAP_SCHEMA_ALLOW_NONE         0x00 /* Strict parsing               */
+#define LDAP_SCHEMA_ALLOW_NO_OID       0x01 /* Allow missing oid            */
+#define LDAP_SCHEMA_ALLOW_QUOTED       0x02 /* Allow bogus extra quotes     */
+#define LDAP_SCHEMA_ALLOW_DESCR                0x04 /* Allow descr instead of OID   */
+#define LDAP_SCHEMA_ALLOW_DESCR_PREFIX 0x08 /* Allow descr as OID prefix    */
+#define LDAP_SCHEMA_ALLOW_ALL          0x0f /* Be very liberal in parsing   */
+
 LIBLDAP_F( LDAP_CONST char * )
 ldap_syntax2name LDAP_P((
        LDAP_SYNTAX * syn ));
@@ -132,25 +143,29 @@ LIBLDAP_F( LDAP_OBJECT_CLASS * )
 ldap_str2objectclass LDAP_P((
        LDAP_CONST char * s,
        int * code,
-       LDAP_CONST char ** errp ));
+       LDAP_CONST char ** errp,
+       LDAP_CONST int flags ));
 
 LIBLDAP_F( LDAP_ATTRIBUTE_TYPE * )
 ldap_str2attributetype LDAP_P((
        LDAP_CONST char * s,
        int * code,
-       LDAP_CONST char ** errp ));
+       LDAP_CONST char ** errp,
+       LDAP_CONST int flags ));
 
 LIBLDAP_F( LDAP_SYNTAX * )
 ldap_str2syntax LDAP_P((
        LDAP_CONST char * s,
        int * code,
-       LDAP_CONST char ** errp ));
+       LDAP_CONST char ** errp,
+       LDAP_CONST int flags ));
 
 LIBLDAP_F( LDAP_MATCHING_RULE * )
 ldap_str2matchingrule LDAP_P((
        LDAP_CONST char * s,
        int * code,
-       LDAP_CONST char ** errp ));
+       LDAP_CONST char ** errp,
+       LDAP_CONST int flags ));
 
 LIBLDAP_F( char *)
 ldap_objectclass2str LDAP_P((

diff --git a/libraries/libldap/schema.c b/libraries/libldap/schema.c
index b43b8cd2c4610cc7ce491e26c14f31352fef2ffc..3f16668ed220c8406d2e900ed9e8e79443079316 100644 (file)
--- a/libraries/libldap/schema.c
+++ b/libraries/libldap/schema.c
@@ -21,7 +21,6 @@
 
 #include <ldap_schema.h>
 
-
 static LDAP_CONST char *
 choose_name( char *names[], LDAP_CONST char *fallback )
 {
@@ -680,7 +679,7 @@ parse_whsp(const char **sp)
 
 /* Parse a sequence of dot-separated decimal strings */
 static char *
-parse_numericoid(const char **sp, int *code, const int allow_quoted)
+parse_numericoid(const char **sp, int *code, const int flags)
 {
        char * res;
        const char * start = *sp;
@@ -688,7 +687,7 @@ parse_numericoid(const char **sp, int *code, const int allow_quoted)
        int quoted = 0;
 
        /* Netscape puts the SYNTAX value in quotes (incorrectly) */
-       if ( allow_quoted && **sp == '\'' ) {
+       if ( flags & LDAP_SCHEMA_ALLOW_QUOTED && **sp == '\'' ) {
                quoted = 1;
                (*sp)++;
                start++;
@@ -720,7 +719,7 @@ parse_numericoid(const char **sp, int *code, const int allow_quoted)
        }
        strncpy(res,start,len);
        res[len] = '\0';
-       if ( allow_quoted && quoted ) {
+       if ( flags & LDAP_SCHEMA_ALLOW_QUOTED && quoted ) {
                if ( **sp == '\'' ) {
                        (*sp)++;
                } else {
@@ -1025,11 +1024,12 @@ ldap_syntax_free( LDAP_SYNTAX * syn )
 }
 
 LDAP_SYNTAX *
-ldap_str2syntax( const char * s, int * code, const char ** errp )
+ldap_str2syntax( const char * s, int * code, const char ** errp, const int flags )
 {
        int kind;
        const char * ss = s;
        char * sval;
+       int seen_name = 0;
        int seen_desc = 0;
        LDAP_SYNTAX * syn;
        char ** ext_vals;
@@ -1080,7 +1080,24 @@ ldap_str2syntax( const char * s, int * code, const char ** errp )
                case TK_RIGHTPAREN:
                        return syn;
                case TK_BAREWORD:
-                       if ( !strcmp(sval,"DESC") ) {
+                       if ( !strcmp(sval,"NAME") ) {
+                               LDAP_FREE(sval);
+                               if ( seen_name ) {
+                                       *code = LDAP_SCHERR_DUPOPT;
+                                       *errp = ss;
+                                       ldap_syntax_free(syn);
+                                       return(NULL);
+                               }
+                               seen_name = 1;
+                               syn->syn_names = parse_qdescrs(&ss,code);
+                               if ( !syn->syn_names ) {
+                                       if ( *code != LDAP_SCHERR_OUTOFMEM )
+                                               *code = LDAP_SCHERR_BADNAME;
+                                       *errp = ss;
+                                       ldap_syntax_free(syn);
+                                       return NULL;
+                               }
+                       } else if ( !strcmp(sval,"DESC") ) {
                                LDAP_FREE(sval);
                                if ( seen_desc ) {
                                        *code = LDAP_SCHERR_DUPOPT;
@@ -1146,12 +1163,11 @@ ldap_matchingrule_free( LDAP_MATCHING_RULE * mr )
 }
 
 LDAP_MATCHING_RULE *
-ldap_str2matchingrule( const char * s, int * code, const char ** errp )
+ldap_str2matchingrule( const char * s, int * code, const char ** errp, const int flags )
 {
        int kind;
        const char * ss = s;
        char * sval;
-       int be_liberal = 1;     /* Future additional argument */
        int seen_name = 0;
        int seen_desc = 0;
        int seen_obsolete = 0;
@@ -1184,9 +1200,9 @@ ldap_str2matchingrule( const char * s, int * code, const char ** errp )
 
        parse_whsp(&ss);
        savepos = ss;
-       mr->mr_oid = parse_numericoid(&ss,code,be_liberal);
+       mr->mr_oid = parse_numericoid(&ss,code,flags);
        if ( !mr->mr_oid ) {
-               if ( be_liberal ) {
+               if ( flags & LDAP_SCHEMA_ALLOW_NO_OID ) {
                        /* Backtracking */
                        ss = savepos;
                        kind = get_token(&ss,&sval);
@@ -1285,7 +1301,7 @@ ldap_str2matchingrule( const char * s, int * code, const char ** errp )
                                seen_syntax = 1;
                                parse_whsp(&ss);
                                mr->mr_syntax_oid =
-                                       parse_numericoid(&ss,code,be_liberal);
+                                       parse_numericoid(&ss,code,flags);
                                if ( !mr->mr_syntax_oid ) {
                                        *errp = ss;
                                        ldap_matchingrule_free(mr);
@@ -1342,12 +1358,11 @@ ldap_attributetype_free(LDAP_ATTRIBUTE_TYPE * at)
 }
 
 LDAP_ATTRIBUTE_TYPE *
-ldap_str2attributetype( const char * s, int * code, const char ** errp )
+ldap_str2attributetype( const char * s, int * code, const char ** errp, const int flags )
 {
        int kind;
        const char * ss = s;
        char * sval;
-       int be_liberal = 1;     /* Future additional argument */
        int seen_name = 0;
        int seen_desc = 0;
        int seen_obsolete = 0;
@@ -1394,7 +1409,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
        savepos = ss;
        at->at_oid = parse_numericoid(&ss,code,0);
        if ( !at->at_oid ) {
-               if ( be_liberal ) {
+               if ( flags & LDAP_SCHEMA_ALLOW_NO_OID ) {
                        /* Backtracking */
                        ss = savepos;
                        kind = get_token(&ss,&sval);
@@ -1564,7 +1579,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                        parse_noidlen(&ss,
                                                      code,
                                                      &at->at_syntax_len,
-                                                     be_liberal);
+                                                     flags);
                                if ( !at->at_syntax_oid ) {
                                        *errp = ss;
                                        ldap_attributetype_free(at);
@@ -1688,12 +1703,11 @@ ldap_objectclass_free(LDAP_OBJECT_CLASS * oc)
 }
 
 LDAP_OBJECT_CLASS *
-ldap_str2objectclass( const char * s, int * code, const char ** errp )
+ldap_str2objectclass( const char * s, int * code, const char ** errp, const int flags )
 {
        int kind;
        const char * ss = s;
        char * sval;
-       int be_liberal = 1;     /* Future additional argument */
        int seen_name = 0;
        int seen_desc = 0;
        int seen_obsolete = 0;
@@ -1738,7 +1752,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
        savepos = ss;
        oc->oc_oid = parse_numericoid(&ss,code,0);
        if ( !oc->oc_oid ) {
-               if ( be_liberal ) {
+               if ( flags & LDAP_SCHEMA_ALLOW_ALL ) {
                        /* Backtracking */
                        ss = savepos;
                        kind = get_token(&ss,&sval);
@@ -1841,7 +1855,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                seen_sup = 1;
                                oc->oc_sup_oids = parse_oids(&ss,
                                                             code,
-                                                            be_liberal);
+                                                            flags);
                                if ( !oc->oc_sup_oids ) {
                                        *errp = ss;
                                        ldap_objectclass_free(oc);

diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c
index 390b670911d14e8dab1ddb5c02cf4acc897cdab4..579f6389efd8d6d003bcf741ff8a927ccf3f3336 100644 (file)
--- a/servers/slapd/mr.c
+++ b/servers/slapd/mr.c
@@ -169,7 +169,7 @@ register_matching_rule(
                return -1;
        }
 
-       mr = ldap_str2matchingrule( desc, &code, &err);
+       mr = ldap_str2matchingrule( desc, &code, &err, LDAP_SCHEMA_ALLOW_ALL);
        if ( !mr ) {
                Debug( LDAP_DEBUG_ANY, "Error in register_matching_rule: %s before %s in %s\n",
                    ldap_scherr2str(code), err, desc );

diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index 68bc0ae31bdbd41fbd2ba8a7886e98ced5221ad2..99eaa3a5e18ce08ff8067a6249696871f927c924 100644 (file)
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -273,7 +273,7 @@ parse_oc(
        const char      *err;
        char            *oid = NULL;
 
-       oc = ldap_str2objectclass(line,&code,&err);
+       oc = ldap_str2objectclass(line,&code,&err,LDAP_SCHEMA_ALLOW_ALL);
        if ( !oc ) {
                fprintf( stderr, "%s: line %d: %s before %s\n",
                         fname, lineno, ldap_scherr2str(code), err );
@@ -398,7 +398,7 @@ parse_at(
                        break;
                }
        }
-       at = ldap_str2attributetype(line,&code,&err);
+       at = ldap_str2attributetype(line,&code,&err,LDAP_SCHEMA_ALLOW_ALL);
        if ( !at ) {
                fprintf( stderr, "%s: line %d: %s before %s\n",
                         fname, lineno, ldap_scherr2str(code), err );

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index b38de39055153fced36fa478341c8f32b2875a4e..e46db6e33c12d7ec00ad159487ea7c7dfac6c166 100644 (file)
--- a/servers/slapd/syntax.c
+++ b/servers/slapd/syntax.c
@@ -148,7 +148,7 @@ register_syntax(
        int             code;
        const char      *err;
 
-       syn = ldap_str2syntax( desc, &code, &err);
+       syn = ldap_str2syntax( desc, &code, &err, LDAP_SCHEMA_ALLOW_ALL);
        if ( !syn ) {
                Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s before %s in %s\n",
                    ldap_scherr2str(code), err, desc );