ITS#6254

[openldap] / libraries / libldap / schema.c

diff --git a/libraries/libldap/schema.c b/libraries/libldap/schema.c
index 3a472391d5d4378371c52fd31c59cfec03d770b6..691d6adddee60535413f6eb611bc775b6d036ad1 100644 (file)
--- a/libraries/libldap/schema.c
+++ b/libraries/libldap/schema.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,6 +30,8 @@
 
 #include <ldap_schema.h>
 
+static const char EndOfInput[] = "end of input";
+
 static const char *
 choose_name( char *names[], const char *fallback )
 {
@@ -1027,6 +1029,9 @@ get_token( const char ** sp, char ** token_val )
                        **sp != ')' &&
                        **sp != '$' &&
                        **sp != '\'' &&
+                       /* for suggested minimum upper bound on the number
+                        * of characters (RFC 4517) */
+                       **sp != '{' &&
                        **sp != '\0' )
                        (*sp)++;
                q = *sp;
@@ -1229,10 +1234,13 @@ parse_woid(const char **sp, int *code)
 
 /* Parse a noidlen */
 static char *
-parse_noidlen(const char **sp, int *code, int *len, int allow_quoted)
+parse_noidlen(const char **sp, int *code, int *len, int flags)
 {
        char * sval;
+       const char *savepos;
        int quoted = 0;
+       int allow_quoted = ( flags & LDAP_SCHEMA_ALLOW_QUOTED );
+       int allow_oidmacro = ( flags & LDAP_SCHEMA_ALLOW_OID_MACRO );
 
        *len = 0;
        /* Netscape puts the SYNTAX value in quotes (incorrectly) */
@@ -1240,9 +1248,22 @@ parse_noidlen(const char **sp, int *code, int *len, int allow_quoted)
                quoted = 1;
                (*sp)++;
        }
+       savepos = *sp;
        sval = ldap_int_parse_numericoid(sp, code, 0);
        if ( !sval ) {
-               return NULL;
+               if ( allow_oidmacro
+                       && *sp == savepos
+                       && *code == LDAP_SCHERR_NODIGIT )
+               {
+                       if ( get_token(sp, &sval) != TK_BAREWORD ) {
+                               if ( sval != NULL ) {
+                                       LDAP_FREE(sval);
+                               }
+                               return NULL;
+                       }
+               } else {
+                       return NULL;
+               }
        }
        if ( **sp == '{' /*}*/ ) {
                (*sp)++;
@@ -1395,16 +1416,20 @@ add_extension(LDAPSchemaExtensionItem ***extensions,
        if ( !*extensions ) {
                *extensions =
                  LDAP_CALLOC(2, sizeof(LDAPSchemaExtensionItem *));
-               if ( !*extensions )
-                 return 1;
+               if ( !*extensions ) {
+                       LDAP_FREE( ext );
+                       return 1;
+               }
                n = 0;
        } else {
                for ( n=0; (*extensions)[n] != NULL; n++ )
                        ;
                tmp = LDAP_REALLOC(*extensions,
                                   (n+2)*sizeof(LDAPSchemaExtensionItem *));
-               if ( !tmp )
+               if ( !tmp ) {
+                       LDAP_FREE( ext );
                        return 1;
+               }
                *extensions = tmp;
        }
        (*extensions)[n] = ext;
@@ -1491,7 +1516,7 @@ ldap_str2syntax( LDAP_CONST char * s,
                switch (kind) {
                case TK_EOS:
                        *code = LDAP_SCHERR_NORIGHTPAREN;
-                       *errp = ss;
+                       *errp = EndOfInput;
                        ldap_syntax_free(syn);
                        return NULL;
                case TK_RIGHTPAREN:
@@ -1656,7 +1681,7 @@ ldap_str2matchingrule( LDAP_CONST char * s,
                switch (kind) {
                case TK_EOS:
                        *code = LDAP_SCHERR_NORIGHTPAREN;
-                       *errp = ss;
+                       *errp = EndOfInput;
                        ldap_matchingrule_free(mr);
                        return NULL;
                case TK_RIGHTPAREN:
@@ -1855,7 +1880,7 @@ ldap_str2matchingruleuse( LDAP_CONST char * s,
                switch (kind) {
                case TK_EOS:
                        *code = LDAP_SCHERR_NORIGHTPAREN;
-                       *errp = ss;
+                       *errp = EndOfInput;
                        ldap_matchingruleuse_free(mru);
                        return NULL;
                case TK_RIGHTPAREN:
@@ -2037,7 +2062,8 @@ ldap_str2attributetype( LDAP_CONST char * s,
        if ( !at->at_oid ) {
                if ( ( flags & ( LDAP_SCHEMA_ALLOW_NO_OID
                                | LDAP_SCHEMA_ALLOW_OID_MACRO ) )
-                           && (ss == savepos) ) {
+                           && (ss == savepos) )
+               {
                        /* Backtracking */
                        ss = savepos;
                        kind = get_token(&ss,&sval);
@@ -2054,11 +2080,13 @@ ldap_str2attributetype( LDAP_CONST char * s,
                                     !strcasecmp(sval, "COLLECTIVE") ||
                                     !strcasecmp(sval, "NO-USER-MODIFICATION") ||
                                     !strcasecmp(sval, "USAGE") ||
-                                    !strncasecmp(sval, "X-", 2) ) {
+                                    !strncasecmp(sval, "X-", 2) )
+                               {
                                        /* Missing OID, backtrack */
                                        ss = savepos;
                                } else if ( flags
-                                       & LDAP_SCHEMA_ALLOW_OID_MACRO) {
+                                       & LDAP_SCHEMA_ALLOW_OID_MACRO)
+                               {
                                        /* Non-numerical OID ... */
                                        int len = ss-savepos;
                                        at->at_oid = LDAP_MALLOC(len+1);
@@ -2084,7 +2112,7 @@ ldap_str2attributetype( LDAP_CONST char * s,
                switch (kind) {
                case TK_EOS:
                        *code = LDAP_SCHERR_NORIGHTPAREN;
-                       *errp = ss;
+                       *errp = EndOfInput;
                        ldap_attributetype_free(at);
                        return NULL;
                case TK_RIGHTPAREN:
@@ -2457,7 +2485,7 @@ ldap_str2objectclass( LDAP_CONST char * s,
                switch (kind) {
                case TK_EOS:
                        *code = LDAP_SCHERR_NORIGHTPAREN;
-                       *errp = ss;
+                       *errp = EndOfInput;
                        ldap_objectclass_free(oc);
                        return NULL;
                case TK_RIGHTPAREN:
@@ -2736,7 +2764,7 @@ ldap_str2contentrule( LDAP_CONST char * s,
                switch (kind) {
                case TK_EOS:
                        *code = LDAP_SCHERR_NORIGHTPAREN;
-                       *errp = ss;
+                       *errp = EndOfInput;
                        ldap_contentrule_free(cr);
                        return NULL;
                case TK_RIGHTPAREN:
@@ -2961,7 +2989,7 @@ ldap_str2structurerule( LDAP_CONST char * s,
                switch (kind) {
                case TK_EOS:
                        *code = LDAP_SCHERR_NORIGHTPAREN;
-                       *errp = ss;
+                       *errp = EndOfInput;
                        ldap_structurerule_free(sr);
                        return NULL;
                case TK_RIGHTPAREN:
@@ -3150,7 +3178,7 @@ ldap_str2nameform( LDAP_CONST char * s,
                switch (kind) {
                case TK_EOS:
                        *code = LDAP_SCHERR_NORIGHTPAREN;
-                       *errp = ss;
+                       *errp = EndOfInput;
                        ldap_nameform_free(nf);
                        return NULL;
                case TK_RIGHTPAREN:
@@ -3209,6 +3237,21 @@ ldap_str2nameform( LDAP_CONST char * s,
                                seen_obsolete = 1;
                                nf->nf_obsolete = LDAP_SCHEMA_YES;
                                parse_whsp(&ss);
+                       } else if ( !strcasecmp(sval,"OC") ) {
+                               LDAP_FREE(sval);
+                               if ( seen_class ) {
+                                       *code = LDAP_SCHERR_DUPOPT;
+                                       *errp = ss;
+                                       ldap_nameform_free(nf);
+                                       return(NULL);
+                               }
+                               seen_class = 1;
+                               nf->nf_objectclass = parse_woid(&ss,code);
+                               if ( !nf->nf_objectclass ) {
+                                       *errp = ss;
+                                       ldap_nameform_free(nf);
+                                       return NULL;
+                               }
                        } else if ( !strcasecmp(sval,"MUST") ) {
                                LDAP_FREE(sval);
                                if ( seen_must ) {