Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / libldap / schema.c

diff --git a/libraries/libldap/schema.c b/libraries/libldap/schema.c
index bff6c5bdbe11db353cbb016bc8a49f0a14ea314a..a098b514f29fea2c1118b0f14fc231959b1018bb 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-2013 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 )
 {
@@ -39,48 +41,56 @@ choose_name( char *names[], const char *fallback )
 LDAP_CONST char *
 ldap_syntax2name( LDAPSyntax * syn )
 {
+       if (!syn) return NULL;
        return( syn->syn_oid );
 }
 
 LDAP_CONST char *
 ldap_matchingrule2name( LDAPMatchingRule * mr )
 {
+       if (!mr) return NULL;
        return( choose_name( mr->mr_names, mr->mr_oid ) );
 }
 
 LDAP_CONST char *
 ldap_matchingruleuse2name( LDAPMatchingRuleUse * mru )
 {
+       if (!mru) return NULL;
        return( choose_name( mru->mru_names, mru->mru_oid ) );
 }
 
 LDAP_CONST char *
 ldap_attributetype2name( LDAPAttributeType * at )
 {
+       if (!at) return NULL;
        return( choose_name( at->at_names, at->at_oid ) );
 }
 
 LDAP_CONST char *
 ldap_objectclass2name( LDAPObjectClass * oc )
 {
+       if (!oc) return NULL;
        return( choose_name( oc->oc_names, oc->oc_oid ) );
 }
 
 LDAP_CONST char *
 ldap_contentrule2name( LDAPContentRule * cr )
 {
+       if (!cr) return NULL;
        return( choose_name( cr->cr_names, cr->cr_oid ) );
 }
 
 LDAP_CONST char *
 ldap_nameform2name( LDAPNameForm * nf )
 {
+       if (!nf) return NULL;
        return( choose_name( nf->nf_names, nf->nf_oid ) );
 }
 
 LDAP_CONST char *
 ldap_structurerule2name( LDAPStructureRule * sr )
 {
+       if (!sr) return NULL;
        return( choose_name( sr->sr_names, NULL ) );
 }
 
@@ -377,7 +387,10 @@ struct berval *
 ldap_syntax2bv( LDAPSyntax * syn, struct berval *bv )
 {
        safe_string * ss;
-       
+
+       if ( !syn || !bv )
+               return NULL;
+
        ss = new_safe_string(256);
        if ( !ss )
                return NULL;
@@ -419,7 +432,10 @@ struct berval *
 ldap_matchingrule2bv( LDAPMatchingRule * mr, struct berval *bv )
 {
        safe_string * ss;
-       
+
+       if ( !mr || !bv )
+               return NULL;
+
        ss = new_safe_string(256);
        if ( !ss )
                return NULL;
@@ -478,7 +494,10 @@ struct berval *
 ldap_matchingruleuse2bv( LDAPMatchingRuleUse * mru, struct berval *bv )
 {
        safe_string * ss;
-       
+
+       if ( !mru || !bv )
+               return NULL;
+
        ss = new_safe_string(256);
        if ( !ss )
                return NULL;
@@ -537,7 +556,10 @@ struct berval *
 ldap_objectclass2bv( LDAPObjectClass * oc, struct berval *bv )
 {
        safe_string * ss;
-       
+
+       if ( !oc || !bv )
+               return NULL;
+
        ss = new_safe_string(256);
        if ( !ss )
                return NULL;
@@ -626,7 +648,10 @@ struct berval *
 ldap_contentrule2bv( LDAPContentRule * cr, struct berval *bv )
 {
        safe_string * ss;
-       
+
+       if ( !cr || !bv )
+               return NULL;
+
        ss = new_safe_string(256);
        if ( !ss )
                return NULL;
@@ -705,7 +730,10 @@ struct berval *
 ldap_structurerule2bv( LDAPStructureRule * sr, struct berval *bv )
 {
        safe_string * ss;
-       
+
+       if ( !sr || !bv )
+               return NULL;
+
        ss = new_safe_string(256);
        if ( !ss )
                return NULL;
@@ -769,7 +797,10 @@ struct berval *
 ldap_nameform2bv( LDAPNameForm * nf, struct berval *bv )
 {
        safe_string * ss;
-       
+
+       if ( !nf || !bv )
+               return NULL;
+
        ss = new_safe_string(256);
        if ( !ss )
                return NULL;
@@ -838,7 +869,10 @@ struct berval *
 ldap_attributetype2bv(  LDAPAttributeType * at, struct berval *bv )
 {
        safe_string * ss;
-       
+
+       if ( !at || !bv )
+               return NULL;
+
        ss = new_safe_string(256);
        if ( !ss )
                return NULL;
@@ -1027,6 +1061,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;
@@ -1411,16 +1448,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;
@@ -1446,6 +1487,7 @@ free_extensions(LDAPSchemaExtensionItem **extensions)
 void
 ldap_syntax_free( LDAPSyntax * syn )
 {
+       if ( !syn ) return;
        LDAP_FREE(syn->syn_oid);
        if (syn->syn_names) LDAP_VFREE(syn->syn_names);
        if (syn->syn_desc) LDAP_FREE(syn->syn_desc);
@@ -1507,7 +1549,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:
@@ -1587,6 +1629,7 @@ ldap_str2syntax( LDAP_CONST char * s,
 void
 ldap_matchingrule_free( LDAPMatchingRule * mr )
 {
+       if (!mr) return;
        LDAP_FREE(mr->mr_oid);
        if (mr->mr_names) LDAP_VFREE(mr->mr_names);
        if (mr->mr_desc) LDAP_FREE(mr->mr_desc);
@@ -1672,7 +1715,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:
@@ -1786,6 +1829,7 @@ ldap_str2matchingrule( LDAP_CONST char * s,
 void
 ldap_matchingruleuse_free( LDAPMatchingRuleUse * mru )
 {
+       if (!mru) return;
        LDAP_FREE(mru->mru_oid);
        if (mru->mru_names) LDAP_VFREE(mru->mru_names);
        if (mru->mru_desc) LDAP_FREE(mru->mru_desc);
@@ -1871,7 +1915,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:
@@ -1984,6 +2028,7 @@ ldap_str2matchingruleuse( LDAP_CONST char * s,
 void
 ldap_attributetype_free(LDAPAttributeType * at)
 {
+       if (!at) return;
        LDAP_FREE(at->at_oid);
        if (at->at_names) LDAP_VFREE(at->at_names);
        if (at->at_desc) LDAP_FREE(at->at_desc);
@@ -2053,7 +2098,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);
@@ -2070,11 +2116,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);
@@ -2100,7 +2148,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:
@@ -2364,6 +2412,7 @@ ldap_str2attributetype( LDAP_CONST char * s,
 void
 ldap_objectclass_free(LDAPObjectClass * oc)
 {
+       if (!oc) return;
        LDAP_FREE(oc->oc_oid);
        if (oc->oc_names) LDAP_VFREE(oc->oc_names);
        if (oc->oc_desc) LDAP_FREE(oc->oc_desc);
@@ -2473,7 +2522,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:
@@ -2650,6 +2699,7 @@ ldap_str2objectclass( LDAP_CONST char * s,
 void
 ldap_contentrule_free(LDAPContentRule * cr)
 {
+       if (!cr) return;
        LDAP_FREE(cr->cr_oid);
        if (cr->cr_names) LDAP_VFREE(cr->cr_names);
        if (cr->cr_desc) LDAP_FREE(cr->cr_desc);
@@ -2752,7 +2802,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:
@@ -2907,6 +2957,7 @@ ldap_str2contentrule( LDAP_CONST char * s,
 void
 ldap_structurerule_free(LDAPStructureRule * sr)
 {
+       if (!sr) return;
        if (sr->sr_names) LDAP_VFREE(sr->sr_names);
        if (sr->sr_desc) LDAP_FREE(sr->sr_desc);
        if (sr->sr_nameform) LDAP_FREE(sr->sr_nameform);
@@ -2977,7 +3028,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:
@@ -3089,6 +3140,7 @@ ldap_str2structurerule( LDAP_CONST char * s,
 void
 ldap_nameform_free(LDAPNameForm * nf)
 {
+       if (!nf) return;
        LDAP_FREE(nf->nf_oid);
        if (nf->nf_names) LDAP_VFREE(nf->nf_names);
        if (nf->nf_desc) LDAP_FREE(nf->nf_desc);
@@ -3166,7 +3218,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:
@@ -3225,6 +3277,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 ) {