]> git.sur5r.net Git - openldap/blobdiff - libraries/libldap/schema.c
Delete ldap_build_filter(), it's broke.
[openldap] / libraries / libldap / schema.c
index 251d0cc6c83f0e4391529c407d377ebf6c560f89..dac2eb267ba43d5bad32fe35a07dd0747db48398 100644 (file)
@@ -1,7 +1,9 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1999-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- *
+ */
+/*
  * schema.c:  parsing routines used by servers and clients to process
  *     schema definitions
  */
@@ -11,7 +13,6 @@
 #include <stdio.h>
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
 
 #include <ldap_schema.h>
 
+static const char *
+choose_name( char *names[], const char *fallback )
+{
+       return( (names != NULL && names[0] != NULL) ? names[0] : fallback );
+}
+
+LDAP_CONST char *
+ldap_syntax2name( LDAPSyntax * syn )
+{
+       return( syn->syn_oid );
+}
+
+LDAP_CONST char *
+ldap_matchingrule2name( LDAPMatchingRule * mr )
+{
+       return( choose_name( mr->mr_names, mr->mr_oid ) );
+}
+
+LDAP_CONST char *
+ldap_matchingruleuse2name( LDAPMatchingRuleUse * mru )
+{
+       return( choose_name( mru->mru_names, mru->mru_oid ) );
+}
+
+LDAP_CONST char *
+ldap_attributetype2name( LDAPAttributeType * at )
+{
+       return( choose_name( at->at_names, at->at_oid ) );
+}
+
+LDAP_CONST char *
+ldap_objectclass2name( LDAPObjectClass * oc )
+{
+       return( choose_name( oc->oc_names, oc->oc_oid ) );
+}
+
+
 /*
  * When pretty printing the entities we will be appending to a buffer.
  * Since checking for overflow, realloc'ing and checking if no error
@@ -29,8 +67,8 @@
 
 typedef struct safe_string {
        char * val;
-       int size;
-       int pos;
+       ber_len_t size;
+       ber_len_t pos;
        int at_whsp;
 } safe_string;
 
@@ -88,6 +126,10 @@ append_to_safe_string(safe_string * ss, char * s)
        /* We always make sure there is at least one position available */
        if ( ss->pos + l >= ss->size-1 ) {
                ss->size *= 2;
+               if ( ss->pos + l >= ss->size-1 ) {
+                       ss->size = ss->pos + l + 1;
+               }
+
                temp = LDAP_REALLOC(ss->val, ss->size);
                if ( !temp ) {
                        /* Trouble, out of memory */
@@ -98,7 +140,7 @@ append_to_safe_string(safe_string * ss, char * s)
        }
        strncpy(&ss->val[ss->pos], s, l);
        ss->pos += l;
-       if ( ss->pos > 0 && isspace(ss->val[ss->pos-1]) )
+       if ( ss->pos > 0 && LDAP_SPACE(ss->val[ss->pos-1]) )
                ss->at_whsp = 1;
        else
                ss->at_whsp = 0;
@@ -126,6 +168,8 @@ print_numericoid(safe_string *ss, char *s)
 {
        if ( s )
                return(append_to_safe_string(ss,s));
+       else
+               return(append_to_safe_string(ss,""));
 }
 
 /* This one is identical to print_qdescr */
@@ -176,9 +220,9 @@ print_qdescrs(safe_string *ss, char **sa)
         */
        if ( !sa[0] || ( sa[0] && sa[1] ) ) {
                print_whsp(ss);
-               print_literal(ss,"(");
+               print_literal(ss,"("/*)*/);
                print_qdescrlist(ss,sa);
-               print_literal(ss,")");
+               print_literal(ss,/*(*/")");
                return(print_whsp(ss));
        } else {
          return(print_qdescr(ss,*sa));
@@ -209,10 +253,10 @@ static int
 print_oids(safe_string *ss, char **sa)
 {
        if ( sa[0] && sa[1] ) {
-               print_literal(ss,"(");
+               print_literal(ss,"("/*)*/);
                print_oidlist(ss,sa);
                print_whsp(ss);
-               return(print_literal(ss,")"));
+               return(print_literal(ss,/*(*/")"));
        } else {
                return(print_woid(ss,*sa));
        }
@@ -232,8 +276,27 @@ print_noidlen(safe_string *ss, char *s, int l)
        return(ret);
 }
 
+static int
+print_extensions(safe_string *ss, LDAPSchemaExtensionItem **extensions)
+{
+       LDAPSchemaExtensionItem **ext;
+
+       if ( extensions ) {
+               print_whsp(ss);
+               for ( ext = extensions; *ext != NULL; ext++ ) {
+                       print_literal(ss, (*ext)->lsei_name);
+                       print_whsp(ss);
+                       /* Should be print_qdstrings */
+                       print_qdescrs(ss, (*ext)->lsei_values);
+                       print_whsp(ss);
+               }
+       }
+
+       return 0;
+}
+
 char *
-ldap_syntax2str( const LDAP_SYNTAX * syn )
+ldap_syntax2str( LDAPSyntax * syn )
 {
        safe_string * ss;
        char * retstring;
@@ -242,7 +305,7 @@ ldap_syntax2str( const LDAP_SYNTAX * syn )
        if ( !ss )
                return NULL;
 
-       print_literal(ss,"(");
+       print_literal(ss,"("/*)*/);
        print_whsp(ss);
 
        print_numericoid(ss, syn->syn_oid);
@@ -254,7 +317,108 @@ ldap_syntax2str( const LDAP_SYNTAX * syn )
        }
 
        print_whsp(ss);
-       print_literal(ss,")");
+
+       print_extensions(ss, syn->syn_extensions);
+
+       print_literal(ss,/*(*/ ")");
+
+       retstring = LDAP_STRDUP(safe_string_val(ss));
+       safe_string_free(ss);
+       return(retstring);
+}
+
+char *
+ldap_matchingrule2str( LDAPMatchingRule * mr )
+{
+       safe_string * ss;
+       char * retstring;
+       
+       ss = new_safe_string(256);
+       if ( !ss )
+               return NULL;
+
+       print_literal(ss,"(" /*)*/);
+       print_whsp(ss);
+
+       print_numericoid(ss, mr->mr_oid);
+       print_whsp(ss);
+
+       if ( mr->mr_names ) {
+               print_literal(ss,"NAME");
+               print_qdescrs(ss,mr->mr_names);
+       }
+
+       if ( mr->mr_desc ) {
+               print_literal(ss,"DESC");
+               print_qdstring(ss,mr->mr_desc);
+       }
+
+       if ( mr->mr_obsolete == LDAP_SCHEMA_YES ) {
+               print_literal(ss, "OBSOLETE");
+               print_whsp(ss);
+       }
+
+       if ( mr->mr_syntax_oid ) {
+               print_literal(ss,"SYNTAX");
+               print_whsp(ss);
+               print_literal(ss, mr->mr_syntax_oid);
+               print_whsp(ss);
+       }
+
+       print_whsp(ss);
+
+       print_extensions(ss, mr->mr_extensions);
+
+       print_literal(ss,/*(*/")");
+
+       retstring = LDAP_STRDUP(safe_string_val(ss));
+       safe_string_free(ss);
+       return(retstring);
+}
+
+char *
+ldap_matchingruleuse2str( LDAPMatchingRuleUse * mru )
+{
+       safe_string * ss;
+       char * retstring;
+       
+       ss = new_safe_string(256);
+       if ( !ss )
+               return NULL;
+
+       print_literal(ss,"(" /*)*/);
+       print_whsp(ss);
+
+       print_numericoid(ss, mru->mru_oid);
+       print_whsp(ss);
+
+       if ( mru->mru_names ) {
+               print_literal(ss,"NAME");
+               print_qdescrs(ss,mru->mru_names);
+       }
+
+       if ( mru->mru_desc ) {
+               print_literal(ss,"DESC");
+               print_qdstring(ss,mru->mru_desc);
+       }
+
+       if ( mru->mru_obsolete == LDAP_SCHEMA_YES ) {
+               print_literal(ss, "OBSOLETE");
+               print_whsp(ss);
+       }
+
+       if ( mru->mru_applies_oids ) {
+               print_literal(ss,"APPLIES");
+               print_whsp(ss);
+               print_oids(ss, mru->mru_applies_oids);
+               print_whsp(ss);
+       }
+
+       print_whsp(ss);
+
+       print_extensions(ss, mru->mru_extensions);
+
+       print_literal(ss,/*(*/")");
 
        retstring = LDAP_STRDUP(safe_string_val(ss));
        safe_string_free(ss);
@@ -262,7 +426,7 @@ ldap_syntax2str( const LDAP_SYNTAX * syn )
 }
 
 char *
-ldap_objectclass2str( const LDAP_OBJECT_CLASS * oc )
+ldap_objectclass2str( LDAPObjectClass * oc )
 {
        safe_string * ss;
        char * retstring;
@@ -271,7 +435,7 @@ ldap_objectclass2str( const LDAP_OBJECT_CLASS * oc )
        if ( !ss )
                return NULL;
 
-       print_literal(ss,"(");
+       print_literal(ss,"("/*)*/);
        print_whsp(ss);
 
        print_numericoid(ss, oc->oc_oid);
@@ -330,7 +494,10 @@ ldap_objectclass2str( const LDAP_OBJECT_CLASS * oc )
        }
 
        print_whsp(ss);
-       print_literal(ss,")");
+
+       print_extensions(ss, oc->oc_extensions);
+
+       print_literal(ss, /*(*/")");
 
        retstring = LDAP_STRDUP(safe_string_val(ss));
        safe_string_free(ss);
@@ -338,7 +505,7 @@ ldap_objectclass2str( const LDAP_OBJECT_CLASS * oc )
 }
 
 char *
-ldap_attributetype2str( const LDAP_ATTRIBUTE_TYPE * at )
+ldap_attributetype2str(  LDAPAttributeType * at )
 {
        safe_string * ss;
        char * retstring;
@@ -347,7 +514,7 @@ ldap_attributetype2str( const LDAP_ATTRIBUTE_TYPE * at )
        if ( !ss )
                return NULL;
 
-       print_literal(ss,"(");
+       print_literal(ss,"("/*)*/);
        print_whsp(ss);
 
        print_numericoid(ss, at->at_oid);
@@ -430,7 +597,10 @@ ldap_attributetype2str( const LDAP_ATTRIBUTE_TYPE * at )
        }
        
        print_whsp(ss);
-       print_literal(ss,")");
+
+       print_extensions(ss, at->at_extensions);
+
+       print_literal(ss,/*(*/")");
 
        retstring = LDAP_STRDUP(safe_string_val(ss));
        safe_string_free(ss);
@@ -476,13 +646,14 @@ struct token {
 };
 
 static int
-get_token(const char ** sp, char ** token_val)
+get_token( const char ** sp, char ** token_val )
 {
        int kind;
        const char * p;
        const char * q;
        char * res;
 
+       *token_val = NULL;
        switch (**sp) {
        case '\0':
                kind = TK_EOS;
@@ -524,7 +695,12 @@ get_token(const char ** sp, char ** token_val)
        default:
                kind = TK_BAREWORD;
                p = *sp;
-               while ( !isspace(**sp) && **sp != '\0' )
+               while ( !LDAP_SPACE(**sp) &&
+                       **sp != '(' &&
+                       **sp != ')' &&
+                       **sp != '$' &&
+                       **sp != '\'' &&
+                       **sp != '\0' )
                        (*sp)++;
                q = *sp;
                res = LDAP_MALLOC(q-p+1);
@@ -547,7 +723,7 @@ get_token(const char ** sp, char ** token_val)
 static void
 parse_whsp(const char **sp)
 {
-       while (isspace(**sp))
+       while (LDAP_SPACE(**sp))
                (*sp)++;
 }
 
@@ -560,16 +736,23 @@ parse_whsp(const char **sp)
  */
 
 /* Parse a sequence of dot-separated decimal strings */
-static char *
-parse_numericoid(const char **sp, int *code)
+char *
+parse_numericoid(const char **sp, int *code, const int flags)
 {
        char * res;
        const char * start = *sp;
        int len;
+       int quoted = 0;
 
+       /* Netscape puts the SYNTAX value in quotes (incorrectly) */
+       if ( flags & LDAP_SCHEMA_ALLOW_QUOTED && **sp == '\'' ) {
+               quoted = 1;
+               (*sp)++;
+               start++;
+       }
        /* Each iteration of this loop gets one decimal string */
        while (**sp) {
-               if ( !isdigit(**sp) ) {
+               if ( !LDAP_DIGIT(**sp) ) {
                        /*
                         * Initial char is not a digit or char after dot is
                         * not a digit
@@ -578,7 +761,7 @@ parse_numericoid(const char **sp, int *code)
                        return NULL;
                }
                (*sp)++;
-               while ( isdigit(**sp) )
+               while ( LDAP_DIGIT(**sp) )
                        (*sp)++;
                if ( **sp != '.' )
                        break;
@@ -594,6 +777,15 @@ parse_numericoid(const char **sp, int *code)
        }
        strncpy(res,start,len);
        res[len] = '\0';
+       if ( flags & LDAP_SCHEMA_ALLOW_QUOTED && quoted ) {
+               if ( **sp == '\'' ) {
+                       (*sp)++;
+               } else {
+                       *code = LDAP_SCHERR_UNEXPTOKEN;
+                       LDAP_FREE(res);
+                       return NULL;
+               }
+       }
        return(res);
 }
 
@@ -630,6 +822,7 @@ parse_qdescrs(const char **sp, int *code)
                                        res1 = LDAP_REALLOC(res,size*sizeof(char *));
                                        if ( !res1 ) {
                                                LDAP_VFREE(res);
+                                               LDAP_FREE(sval);
                                                *code = LDAP_SCHERR_OUTOFMEM;
                                                return(NULL);
                                        }
@@ -640,6 +833,7 @@ parse_qdescrs(const char **sp, int *code)
                                parse_whsp(sp);
                        } else {
                                LDAP_VFREE(res);
+                               LDAP_FREE(sval);
                                *code = LDAP_SCHERR_UNEXPTOKEN;
                                return(NULL);
                        }
@@ -658,6 +852,7 @@ parse_qdescrs(const char **sp, int *code)
                parse_whsp(sp);
                return res;
        } else {
+               LDAP_FREE(sval);
                *code = LDAP_SCHERR_BADNAME;
                return NULL;
        }
@@ -673,6 +868,7 @@ parse_woid(const char **sp, int *code)
        parse_whsp(sp);
        kind = get_token(sp, &sval);
        if ( kind != TK_BAREWORD ) {
+               LDAP_FREE(sval);
                *code = LDAP_SCHERR_UNEXPTOKEN;
                return NULL;
        }
@@ -682,35 +878,34 @@ parse_woid(const char **sp, int *code)
 
 /* Parse a noidlen */
 static char *
-parse_noidlen(const char **sp, int *code, int *len, int be_liberal)
+parse_noidlen(const char **sp, int *code, int *len, int allow_quoted)
 {
        char * sval;
-       int kind;
        int quoted = 0;
 
        *len = 0;
        /* Netscape puts the SYNTAX value in quotes (incorrectly) */
-       if ( be_liberal && **sp == '\'' ) {
+       if ( allow_quoted && **sp == '\'' ) {
                quoted = 1;
                (*sp)++;
        }
-       sval = parse_numericoid(sp, code);
+       sval = parse_numericoid(sp, code, 0);
        if ( !sval ) {
                return NULL;
        }
-       if ( **sp == '{' ) {
+       if ( **sp == '{' /*}*/ ) {
                (*sp)++;
                *len = atoi(*sp);
-               while ( isdigit(**sp) )
+               while ( LDAP_DIGIT(**sp) )
                        (*sp)++;
-               if ( **sp != '}' ) {
+               if ( **sp != /*{*/ '}' ) {
                        *code = LDAP_SCHERR_UNEXPTOKEN;
                        LDAP_FREE(sval);
                        return NULL;
                }
                (*sp)++;
        }               
-       if ( be_liberal && quoted ) {
+       if ( allow_quoted && quoted ) {
                if ( **sp == '\'' ) {
                        (*sp)++;
                } else {
@@ -724,14 +919,14 @@ parse_noidlen(const char **sp, int *code, int *len, int be_liberal)
 
 /*
  * Next routine will accept a qdstring in place of an oid if
- * be_liberal is set.  This is necessary to interoperate with Netscape
- * Directory server that will improperly quote each oid (at least
- * those of the descr kind) in the SUP clause.
+ * allow_quoted is set.  This is necessary to interoperate with
+ * Netscape Directory server that will improperly quote each oid (at
+ * least those of the descr kind) in the SUP clause.
  */
 
 /* Parse a woid or a $-separated list of them enclosed in () */
 static char **
-parse_oids(const char **sp, int *code, const int be_liberal)
+parse_oids(const char **sp, int *code, const int allow_quoted)
 {
        char ** res;
        char ** res1;
@@ -760,11 +955,12 @@ parse_oids(const char **sp, int *code, const int be_liberal)
                parse_whsp(sp);
                kind = get_token(sp,&sval);
                if ( kind == TK_BAREWORD ||
-                    ( be_liberal && kind == TK_QDSTRING ) ) {
+                    ( allow_quoted && kind == TK_QDSTRING ) ) {
                        res[pos] = sval;
                        pos++;
                } else {
                        *code = LDAP_SCHERR_UNEXPTOKEN;
+                       LDAP_FREE(sval);
                        LDAP_VFREE(res);
                        return NULL;
                }
@@ -777,14 +973,16 @@ parse_oids(const char **sp, int *code, const int be_liberal)
                                parse_whsp(sp);
                                kind = get_token(sp,&sval);
                                if ( kind == TK_BAREWORD ||
-                                    ( be_liberal && kind == TK_QDSTRING ) ) {
+                                    ( allow_quoted &&
+                                      kind == TK_QDSTRING ) ) {
                                        if ( pos == size-2 ) {
                                                size++;
                                                res1 = LDAP_REALLOC(res,size*sizeof(char *));
                                                if ( !res1 ) {
-                                                 LDAP_VFREE(res);
-                                                 *code = LDAP_SCHERR_OUTOFMEM;
-                                                 return(NULL);
+                                                       LDAP_FREE(sval);
+                                                       LDAP_VFREE(res);
+                                                       *code = LDAP_SCHERR_OUTOFMEM;
+                                                       return(NULL);
                                                }
                                                res = res1;
                                        }
@@ -792,12 +990,14 @@ parse_oids(const char **sp, int *code, const int be_liberal)
                                        pos++;
                                } else {
                                        *code = LDAP_SCHERR_UNEXPTOKEN;
+                                       LDAP_FREE(sval);
                                        LDAP_VFREE(res);
                                        return NULL;
                                }
                                parse_whsp(sp);
                        } else {
                                *code = LDAP_SCHERR_UNEXPTOKEN;
+                               LDAP_FREE(sval);
                                LDAP_VFREE(res);
                                return NULL;
                        }
@@ -806,9 +1006,10 @@ parse_oids(const char **sp, int *code, const int be_liberal)
                parse_whsp(sp);
                return(res);
        } else if ( kind == TK_BAREWORD ||
-                   ( be_liberal && kind == TK_QDSTRING ) ) {
+                   ( allow_quoted && kind == TK_QDSTRING ) ) {
                res = LDAP_CALLOC(2,sizeof(char *));
                if ( !res ) {
+                       LDAP_FREE(sval);
                        *code = LDAP_SCHERR_OUTOFMEM;
                        return NULL;
                }
@@ -817,28 +1018,83 @@ parse_oids(const char **sp, int *code, const int be_liberal)
                parse_whsp(sp);
                return res;
        } else {
+               LDAP_FREE(sval);
                *code = LDAP_SCHERR_BADNAME;
                return NULL;
        }
 }
 
+static int
+add_extension(LDAPSchemaExtensionItem ***extensions,
+             char * name, char ** values)
+{
+       int n;
+       LDAPSchemaExtensionItem **tmp, *ext;
+
+       ext = LDAP_CALLOC(1, sizeof(LDAPSchemaExtensionItem));
+       if ( !ext )
+               return 1;
+       ext->lsei_name = name;
+       ext->lsei_values = values;
+
+       if ( !*extensions ) {
+               *extensions =
+                 LDAP_CALLOC(2, sizeof(LDAPSchemaExtensionItem *));
+               if ( !*extensions )
+                 return 1;
+               n = 0;
+       } else {
+               for ( n=0; (*extensions)[n] != NULL; n++ )
+                       ;
+               tmp = LDAP_REALLOC(*extensions,
+                                  (n+2)*sizeof(LDAPSchemaExtensionItem *));
+               if ( !tmp )
+                       return 1;
+               *extensions = tmp;
+       }
+       (*extensions)[n] = ext;
+       (*extensions)[n+1] = NULL;
+       return 0;
+}
+
+static void
+free_extensions(LDAPSchemaExtensionItem **extensions)
+{
+       LDAPSchemaExtensionItem **ext;
+
+       if ( extensions ) {
+               for ( ext = extensions; *ext != NULL; ext++ ) {
+                       LDAP_FREE((*ext)->lsei_name);
+                       LDAP_VFREE((*ext)->lsei_values);
+                       LDAP_FREE(*ext);
+               }
+               LDAP_FREE(extensions);
+       }
+}
+
 void
-ldap_syntax_free( LDAP_SYNTAX * syn )
+ldap_syntax_free( LDAPSyntax * syn )
 {
        LDAP_FREE(syn->syn_oid);
+       LDAP_VFREE(syn->syn_names);
        LDAP_FREE(syn->syn_desc);
+       free_extensions(syn->syn_extensions);
        LDAP_FREE(syn);
 }
 
-LDAP_SYNTAX *
-ldap_str2syntax( const char * s, int * code, const char ** errp )
+LDAPSyntax *
+ldap_str2syntax( LDAP_CONST char * s,
+       int * code,
+       LDAP_CONST char ** errp,
+       LDAP_CONST int flags )
 {
        int kind;
        const char * ss = s;
        char * sval;
+       int seen_name = 0;
        int seen_desc = 0;
-       LDAP_SYNTAX * syn;
-       char ** ssdummy;
+       LDAPSyntax * syn;
+       char ** ext_vals;
 
        if ( !s ) {
                *code = LDAP_SCHERR_EMPTY;
@@ -847,7 +1103,7 @@ ldap_str2syntax( const char * s, int * code, const char ** errp )
        }
 
        *errp = s;
-       syn = LDAP_CALLOC(1,sizeof(LDAP_SYNTAX));
+       syn = LDAP_CALLOC(1,sizeof(LDAPSyntax));
 
        if ( !syn ) {
                *code = LDAP_SCHERR_OUTOFMEM;
@@ -856,13 +1112,14 @@ ldap_str2syntax( const char * s, int * code, const char ** errp )
 
        kind = get_token(&ss,&sval);
        if ( kind != TK_LEFTPAREN ) {
+               LDAP_FREE(sval);
                *code = LDAP_SCHERR_NOLEFTPAREN;
                ldap_syntax_free(syn);
                return NULL;
        }
 
        parse_whsp(&ss);
-       syn->syn_oid = parse_numericoid(&ss,code);
+       syn->syn_oid = parse_numericoid(&ss,code,0);
        if ( !syn->syn_oid ) {
                *errp = ss;
                ldap_syntax_free(syn);
@@ -885,7 +1142,25 @@ 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;
                                        *errp = ss;
@@ -898,6 +1173,7 @@ ldap_str2syntax( const char * s, int * code, const char ** errp )
                                if ( kind != TK_QDSTRING ) {
                                        *code = LDAP_SCHERR_UNEXPTOKEN;
                                        *errp = ss;
+                                       LDAP_FREE(sval);
                                        ldap_syntax_free(syn);
                                        return NULL;
                                }
@@ -905,15 +1181,24 @@ ldap_str2syntax( const char * s, int * code, const char ** errp )
                                parse_whsp(&ss);
                        } else if ( sval[0] == 'X' && sval[1] == '-' ) {
                                /* Should be parse_qdstrings */
-                               ssdummy = parse_qdescrs(&ss, code);
-                               if ( !ssdummy ) {
+                               ext_vals = parse_qdescrs(&ss, code);
+                               if ( !ext_vals ) {
+                                       *errp = ss;
+                                       ldap_syntax_free(syn);
+                                       return NULL;
+                               }
+                               if ( add_extension(&syn->syn_extensions,
+                                                   sval, ext_vals) ) {
+                                       *code = LDAP_SCHERR_OUTOFMEM;
                                        *errp = ss;
+                                       LDAP_FREE(sval);
                                        ldap_syntax_free(syn);
                                        return NULL;
                                }
                        } else {
                                *code = LDAP_SCHERR_UNEXPTOKEN;
                                *errp = ss;
+                               LDAP_FREE(sval);
                                ldap_syntax_free(syn);
                                return NULL;
                        }
@@ -921,6 +1206,7 @@ ldap_str2syntax( const char * s, int * code, const char ** errp )
                default:
                        *code = LDAP_SCHERR_UNEXPTOKEN;
                        *errp = ss;
+                       LDAP_FREE(sval);
                        ldap_syntax_free(syn);
                        return NULL;
                }
@@ -928,7 +1214,394 @@ ldap_str2syntax( const char * s, int * code, const char ** errp )
 }
 
 void
-ldap_attributetype_free(LDAP_ATTRIBUTE_TYPE * at)
+ldap_matchingrule_free( LDAPMatchingRule * mr )
+{
+       LDAP_FREE(mr->mr_oid);
+       LDAP_VFREE(mr->mr_names);
+       LDAP_FREE(mr->mr_desc);
+       LDAP_FREE(mr->mr_syntax_oid);
+       free_extensions(mr->mr_extensions);
+       LDAP_FREE(mr);
+}
+
+LDAPMatchingRule *
+ldap_str2matchingrule( LDAP_CONST char * s,
+       int * code,
+       LDAP_CONST char ** errp,
+       LDAP_CONST int flags )
+{
+       int kind;
+       const char * ss = s;
+       char * sval;
+       int seen_name = 0;
+       int seen_desc = 0;
+       int seen_obsolete = 0;
+       int seen_syntax = 0;
+       LDAPMatchingRule * mr;
+       char ** ext_vals;
+       const char * savepos;
+
+       if ( !s ) {
+               *code = LDAP_SCHERR_EMPTY;
+               *errp = "";
+               return NULL;
+       }
+
+       *errp = s;
+       mr = LDAP_CALLOC(1,sizeof(LDAPMatchingRule));
+
+       if ( !mr ) {
+               *code = LDAP_SCHERR_OUTOFMEM;
+               return NULL;
+       }
+
+       kind = get_token(&ss,&sval);
+       if ( kind != TK_LEFTPAREN ) {
+               *code = LDAP_SCHERR_NOLEFTPAREN;
+               LDAP_FREE(sval);
+               ldap_matchingrule_free(mr);
+               return NULL;
+       }
+
+       parse_whsp(&ss);
+       savepos = ss;
+       mr->mr_oid = parse_numericoid(&ss,code,flags);
+       if ( !mr->mr_oid ) {
+               if ( flags & LDAP_SCHEMA_ALLOW_NO_OID ) {
+                       /* Backtracking */
+                       ss = savepos;
+                       kind = get_token(&ss,&sval);
+                       if ( kind == TK_BAREWORD ) {
+                               if ( !strcmp(sval, "NAME") ||
+                                    !strcmp(sval, "DESC") ||
+                                    !strcmp(sval, "OBSOLETE") ||
+                                    !strcmp(sval, "SYNTAX") ||
+                                    !strncmp(sval, "X-", 2) ) {
+                                       /* Missing OID, backtrack */
+                                       ss = savepos;
+                               } else {
+                                       /* Non-numerical OID, ignore */
+                               }
+                       }
+                       LDAP_FREE(sval);
+               } else {
+                       *errp = ss;
+                       ldap_matchingrule_free(mr);
+                       return NULL;
+               }
+       }
+       parse_whsp(&ss);
+
+       /*
+        * Beyond this point we will be liberal and accept the items
+        * in any order.
+        */
+       while (1) {
+               kind = get_token(&ss,&sval);
+               switch (kind) {
+               case TK_EOS:
+                       *code = LDAP_SCHERR_NORIGHTPAREN;
+                       *errp = ss;
+                       ldap_matchingrule_free(mr);
+                       return NULL;
+               case TK_RIGHTPAREN:
+                       return mr;
+               case TK_BAREWORD:
+                       if ( !strcmp(sval,"NAME") ) {
+                               LDAP_FREE(sval);
+                               if ( seen_name ) {
+                                       *code = LDAP_SCHERR_DUPOPT;
+                                       *errp = ss;
+                                       ldap_matchingrule_free(mr);
+                                       return(NULL);
+                               }
+                               seen_name = 1;
+                               mr->mr_names = parse_qdescrs(&ss,code);
+                               if ( !mr->mr_names ) {
+                                       if ( *code != LDAP_SCHERR_OUTOFMEM )
+                                               *code = LDAP_SCHERR_BADNAME;
+                                       *errp = ss;
+                                       ldap_matchingrule_free(mr);
+                                       return NULL;
+                               }
+                       } else if ( !strcmp(sval,"DESC") ) {
+                               LDAP_FREE(sval);
+                               if ( seen_desc ) {
+                                       *code = LDAP_SCHERR_DUPOPT;
+                                       *errp = ss;
+                                       ldap_matchingrule_free(mr);
+                                       return(NULL);
+                               }
+                               seen_desc = 1;
+                               parse_whsp(&ss);
+                               kind = get_token(&ss,&sval);
+                               if ( kind != TK_QDSTRING ) {
+                                       *code = LDAP_SCHERR_UNEXPTOKEN;
+                                       *errp = ss;
+                                       LDAP_FREE(sval);
+                                       ldap_matchingrule_free(mr);
+                                       return NULL;
+                               }
+                               mr->mr_desc = sval;
+                               parse_whsp(&ss);
+                       } else if ( !strcmp(sval,"OBSOLETE") ) {
+                               LDAP_FREE(sval);
+                               if ( seen_obsolete ) {
+                                       *code = LDAP_SCHERR_DUPOPT;
+                                       *errp = ss;
+                                       ldap_matchingrule_free(mr);
+                                       return(NULL);
+                               }
+                               seen_obsolete = 1;
+                               mr->mr_obsolete = LDAP_SCHEMA_YES;
+                               parse_whsp(&ss);
+                       } else if ( !strcmp(sval,"SYNTAX") ) {
+                               LDAP_FREE(sval);
+                               if ( seen_syntax ) {
+                                       *code = LDAP_SCHERR_DUPOPT;
+                                       *errp = ss;
+                                       ldap_matchingrule_free(mr);
+                                       return(NULL);
+                               }
+                               seen_syntax = 1;
+                               parse_whsp(&ss);
+                               mr->mr_syntax_oid =
+                                       parse_numericoid(&ss,code,flags);
+                               if ( !mr->mr_syntax_oid ) {
+                                       *errp = ss;
+                                       ldap_matchingrule_free(mr);
+                                       return NULL;
+                               }
+                               parse_whsp(&ss);
+                       } else if ( sval[0] == 'X' && sval[1] == '-' ) {
+                               /* Should be parse_qdstrings */
+                               ext_vals = parse_qdescrs(&ss, code);
+                               if ( !ext_vals ) {
+                                       *errp = ss;
+                                       ldap_matchingrule_free(mr);
+                                       return NULL;
+                               }
+                               if ( add_extension(&mr->mr_extensions,
+                                                   sval, ext_vals) ) {
+                                       *code = LDAP_SCHERR_OUTOFMEM;
+                                       *errp = ss;
+                                       LDAP_FREE(sval);
+                                       ldap_matchingrule_free(mr);
+                                       return NULL;
+                               }
+                       } else {
+                               *code = LDAP_SCHERR_UNEXPTOKEN;
+                               *errp = ss;
+                               LDAP_FREE(sval);
+                               ldap_matchingrule_free(mr);
+                               return NULL;
+                       }
+                       break;
+               default:
+                       *code = LDAP_SCHERR_UNEXPTOKEN;
+                       *errp = ss;
+                       LDAP_FREE(sval);
+                       ldap_matchingrule_free(mr);
+                       return NULL;
+               }
+       }
+}
+
+void
+ldap_matchingruleuse_free( LDAPMatchingRuleUse * mru )
+{
+       LDAP_FREE(mru->mru_oid);
+       LDAP_VFREE(mru->mru_names);
+       LDAP_FREE(mru->mru_desc);
+       LDAP_VFREE(mru->mru_applies_oids);
+       free_extensions(mru->mru_extensions);
+       LDAP_FREE(mru);
+}
+
+LDAPMatchingRuleUse *
+ldap_str2matchingruleuse( LDAP_CONST char * s,
+       int * code,
+       LDAP_CONST char ** errp,
+       LDAP_CONST int flags )
+{
+       int kind;
+       const char * ss = s;
+       char * sval;
+       int seen_name = 0;
+       int seen_desc = 0;
+       int seen_obsolete = 0;
+       int seen_applies = 0;
+       LDAPMatchingRuleUse * mru;
+       char ** ext_vals;
+       const char * savepos;
+
+       if ( !s ) {
+               *code = LDAP_SCHERR_EMPTY;
+               *errp = "";
+               return NULL;
+       }
+
+       *errp = s;
+       mru = LDAP_CALLOC(1,sizeof(LDAPMatchingRuleUse));
+
+       if ( !mru ) {
+               *code = LDAP_SCHERR_OUTOFMEM;
+               return NULL;
+       }
+
+       kind = get_token(&ss,&sval);
+       if ( kind != TK_LEFTPAREN ) {
+               *code = LDAP_SCHERR_NOLEFTPAREN;
+               LDAP_FREE(sval);
+               ldap_matchingruleuse_free(mru);
+               return NULL;
+       }
+
+       parse_whsp(&ss);
+       savepos = ss;
+       mru->mru_oid = parse_numericoid(&ss,code,flags);
+       if ( !mru->mru_oid ) {
+               if ( flags & LDAP_SCHEMA_ALLOW_NO_OID ) {
+                       /* Backtracking */
+                       ss = savepos;
+                       kind = get_token(&ss,&sval);
+                       if ( kind == TK_BAREWORD ) {
+                               if ( !strcmp(sval, "NAME") ||
+                                    !strcmp(sval, "DESC") ||
+                                    !strcmp(sval, "OBSOLETE") ||
+                                    !strcmp(sval, "APPLIES") ||
+                                    !strncmp(sval, "X-", 2) ) {
+                                       /* Missing OID, backtrack */
+                                       ss = savepos;
+                               } else {
+                                       /* Non-numerical OID, ignore */
+                               }
+                       }
+                       LDAP_FREE(sval);
+               } else {
+                       *errp = ss;
+                       ldap_matchingruleuse_free(mru);
+                       return NULL;
+               }
+       }
+       parse_whsp(&ss);
+
+       /*
+        * Beyond this point we will be liberal and accept the items
+        * in any order.
+        */
+       while (1) {
+               kind = get_token(&ss,&sval);
+               switch (kind) {
+               case TK_EOS:
+                       *code = LDAP_SCHERR_NORIGHTPAREN;
+                       *errp = ss;
+                       ldap_matchingruleuse_free(mru);
+                       return NULL;
+               case TK_RIGHTPAREN:
+                       return mru;
+               case TK_BAREWORD:
+                       if ( !strcmp(sval,"NAME") ) {
+                               LDAP_FREE(sval);
+                               if ( seen_name ) {
+                                       *code = LDAP_SCHERR_DUPOPT;
+                                       *errp = ss;
+                                       ldap_matchingruleuse_free(mru);
+                                       return(NULL);
+                               }
+                               seen_name = 1;
+                               mru->mru_names = parse_qdescrs(&ss,code);
+                               if ( !mru->mru_names ) {
+                                       if ( *code != LDAP_SCHERR_OUTOFMEM )
+                                               *code = LDAP_SCHERR_BADNAME;
+                                       *errp = ss;
+                                       ldap_matchingruleuse_free(mru);
+                                       return NULL;
+                               }
+                       } else if ( !strcmp(sval,"DESC") ) {
+                               LDAP_FREE(sval);
+                               if ( seen_desc ) {
+                                       *code = LDAP_SCHERR_DUPOPT;
+                                       *errp = ss;
+                                       ldap_matchingruleuse_free(mru);
+                                       return(NULL);
+                               }
+                               seen_desc = 1;
+                               parse_whsp(&ss);
+                               kind = get_token(&ss,&sval);
+                               if ( kind != TK_QDSTRING ) {
+                                       *code = LDAP_SCHERR_UNEXPTOKEN;
+                                       *errp = ss;
+                                       LDAP_FREE(sval);
+                                       ldap_matchingruleuse_free(mru);
+                                       return NULL;
+                               }
+                               mru->mru_desc = sval;
+                               parse_whsp(&ss);
+                       } else if ( !strcmp(sval,"OBSOLETE") ) {
+                               LDAP_FREE(sval);
+                               if ( seen_obsolete ) {
+                                       *code = LDAP_SCHERR_DUPOPT;
+                                       *errp = ss;
+                                       ldap_matchingruleuse_free(mru);
+                                       return(NULL);
+                               }
+                               seen_obsolete = 1;
+                               mru->mru_obsolete = LDAP_SCHEMA_YES;
+                               parse_whsp(&ss);
+                       } else if ( !strcmp(sval,"APPLIES") ) {
+                               LDAP_FREE(sval);
+                               if ( seen_applies ) {
+                                       *code = LDAP_SCHERR_DUPOPT;
+                                       *errp = ss;
+                                       ldap_matchingruleuse_free(mru);
+                                       return(NULL);
+                               }
+                               seen_applies = 1;
+                               mru->mru_applies_oids = parse_oids(&ss,
+                                                            code,
+                                                            flags);
+                               if ( !mru->mru_applies_oids ) {
+                                       *errp = ss;
+                                       ldap_matchingruleuse_free(mru);
+                                       return NULL;
+                               }
+                       } else if ( sval[0] == 'X' && sval[1] == '-' ) {
+                               /* Should be parse_qdstrings */
+                               ext_vals = parse_qdescrs(&ss, code);
+                               if ( !ext_vals ) {
+                                       *errp = ss;
+                                       ldap_matchingruleuse_free(mru);
+                                       return NULL;
+                               }
+                               if ( add_extension(&mru->mru_extensions,
+                                                   sval, ext_vals) ) {
+                                       *code = LDAP_SCHERR_OUTOFMEM;
+                                       *errp = ss;
+                                       LDAP_FREE(sval);
+                                       ldap_matchingruleuse_free(mru);
+                                       return NULL;
+                               }
+                       } else {
+                               *code = LDAP_SCHERR_UNEXPTOKEN;
+                               *errp = ss;
+                               LDAP_FREE(sval);
+                               ldap_matchingruleuse_free(mru);
+                               return NULL;
+                       }
+                       break;
+               default:
+                       *code = LDAP_SCHERR_UNEXPTOKEN;
+                       *errp = ss;
+                       LDAP_FREE(sval);
+                       ldap_matchingruleuse_free(mru);
+                       return NULL;
+               }
+       }
+}
+
+void
+ldap_attributetype_free(LDAPAttributeType * at)
 {
        LDAP_FREE(at->at_oid);
        LDAP_VFREE(at->at_names);
@@ -938,16 +1611,19 @@ ldap_attributetype_free(LDAP_ATTRIBUTE_TYPE * at)
        LDAP_FREE(at->at_ordering_oid);
        LDAP_FREE(at->at_substr_oid);
        LDAP_FREE(at->at_syntax_oid);
+       free_extensions(at->at_extensions);
        LDAP_FREE(at);
 }
 
-LDAP_ATTRIBUTE_TYPE *
-ldap_str2attributetype( const char * s, int * code, const char ** errp )
+LDAPAttributeType *
+ldap_str2attributetype( LDAP_CONST char * s,
+       int * code,
+       LDAP_CONST char ** errp,
+       LDAP_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;
@@ -957,11 +1633,8 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
        int seen_substr = 0;
        int seen_syntax = 0;
        int seen_usage = 0;
-       int seen_kind = 0;
-       int seen_must = 0;
-       int seen_may = 0;
-       LDAP_ATTRIBUTE_TYPE * at;
-       char ** ssdummy;
+       LDAPAttributeType * at;
+       char ** ext_vals;
        const char * savepos;
 
        if ( !s ) {
@@ -971,7 +1644,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
        }
 
        *errp = s;
-       at = LDAP_CALLOC(1,sizeof(LDAP_ATTRIBUTE_TYPE));
+       at = LDAP_CALLOC(1,sizeof(LDAPAttributeType));
 
        if ( !at ) {
                *code = LDAP_SCHERR_OUTOFMEM;
@@ -981,6 +1654,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
        kind = get_token(&ss,&sval);
        if ( kind != TK_LEFTPAREN ) {
                *code = LDAP_SCHERR_NOLEFTPAREN;
+               LDAP_FREE(sval);
                ldap_attributetype_free(at);
                return NULL;
        }
@@ -994,9 +1668,11 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
         */
        parse_whsp(&ss);
        savepos = ss;
-       at->at_oid = parse_numericoid(&ss,code);
+       at->at_oid = parse_numericoid(&ss,code,0);
        if ( !at->at_oid ) {
-               if ( be_liberal ) {
+               if ( ( flags & ( LDAP_SCHEMA_ALLOW_NO_OID
+                               | LDAP_SCHEMA_ALLOW_OID_MACRO ) )
+                           && (ss == savepos) ) {
                        /* Backtracking */
                        ss = savepos;
                        kind = get_token(&ss,&sval);
@@ -1016,10 +1692,16 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                     !strncmp(sval, "X-", 2) ) {
                                        /* Missing OID, backtrack */
                                        ss = savepos;
-                               } else {
-                                       /* Non-numerical OID, ignore */
+                               } else if ( flags
+                                       & LDAP_SCHEMA_ALLOW_OID_MACRO) {
+                                       /* Non-numerical OID ... */
+                                       int len = ss-savepos;
+                                       at->at_oid = LDAP_MALLOC(len+1);
+                                       strncpy(at->at_oid, savepos, len);
+                                       at->at_oid[len] = 0;
                                }
-                         }
+                       }
+                       LDAP_FREE(sval);
                } else {
                        *errp = ss;
                        ldap_attributetype_free(at);
@@ -1044,6 +1726,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                        return at;
                case TK_BAREWORD:
                        if ( !strcmp(sval,"NAME") ) {
+                               LDAP_FREE(sval);
                                if ( seen_name ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1060,6 +1743,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                        return NULL;
                                }
                        } else if ( !strcmp(sval,"DESC") ) {
+                               LDAP_FREE(sval);
                                if ( seen_desc ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1072,12 +1756,14 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                if ( kind != TK_QDSTRING ) {
                                        *code = LDAP_SCHERR_UNEXPTOKEN;
                                        *errp = ss;
+                                       LDAP_FREE(sval);
                                        ldap_attributetype_free(at);
                                        return NULL;
                                }
                                at->at_desc = sval;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"OBSOLETE") ) {
+                               LDAP_FREE(sval);
                                if ( seen_obsolete ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1088,6 +1774,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                at->at_obsolete = LDAP_SCHEMA_YES;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"SUP") ) {
+                               LDAP_FREE(sval);
                                if ( seen_sup ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1102,6 +1789,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                        return NULL;
                                }
                        } else if ( !strcmp(sval,"EQUALITY") ) {
+                               LDAP_FREE(sval);
                                if ( seen_equality ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1116,6 +1804,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                        return NULL;
                                }
                        } else if ( !strcmp(sval,"ORDERING") ) {
+                               LDAP_FREE(sval);
                                if ( seen_ordering ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1130,6 +1819,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                        return NULL;
                                }
                        } else if ( !strcmp(sval,"SUBSTR") ) {
+                               LDAP_FREE(sval);
                                if ( seen_substr ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1144,6 +1834,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                        return NULL;
                                }
                        } else if ( !strcmp(sval,"SYNTAX") ) {
+                               LDAP_FREE(sval);
                                if ( seen_syntax ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1152,14 +1843,42 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                }
                                seen_syntax = 1;
                                parse_whsp(&ss);
-                               at->at_syntax_oid = parse_noidlen(&ss,code,&at->at_syntax_len,be_liberal);
+                               savepos = ss;
+                               at->at_syntax_oid =
+                                       parse_noidlen(&ss,
+                                                     code,
+                                                     &at->at_syntax_len,
+                                                     flags);
                                if ( !at->at_syntax_oid ) {
+                                   if ( flags & LDAP_SCHEMA_ALLOW_OID_MACRO ) {
+                                       kind = get_token(&ss,&sval);
+                                       if (kind == TK_BAREWORD)
+                                       {
+                                           char *sp = strchr(sval, '{');
+                                           at->at_syntax_oid = sval;
+                                           if (sp)
+                                           {
+                                               *sp++ = 0;
+                                               at->at_syntax_len = atoi(sp);
+                                               while ( LDAP_DIGIT(*sp) )
+                                                       sp++;
+                                               if ( *sp != '}' ) {
+                                                   *code = LDAP_SCHERR_UNEXPTOKEN;
+                                                   *errp = ss;
+                                                   ldap_attributetype_free(at);
+                                                   return NULL;
+                                               }
+                                           }
+                                       }
+                                   } else {
                                        *errp = ss;
                                        ldap_attributetype_free(at);
                                        return NULL;
+                                   }
                                }
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"SINGLE-VALUE") ) {
+                               LDAP_FREE(sval);
                                if ( at->at_single_value ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1169,6 +1888,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                at->at_single_value = LDAP_SCHEMA_YES;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"COLLECTIVE") ) {
+                               LDAP_FREE(sval);
                                if ( at->at_collective ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1178,6 +1898,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                at->at_collective = LDAP_SCHEMA_YES;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"NO-USER-MODIFICATION") ) {
+                               LDAP_FREE(sval);
                                if ( at->at_no_user_mod ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1187,6 +1908,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                at->at_no_user_mod = LDAP_SCHEMA_YES;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"USAGE") ) {
+                               LDAP_FREE(sval);
                                if ( seen_usage ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1199,6 +1921,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                if ( kind != TK_BAREWORD ) {
                                        *code = LDAP_SCHERR_UNEXPTOKEN;
                                        *errp = ss;
+                                       LDAP_FREE(sval);
                                        ldap_attributetype_free(at);
                                        return NULL;
                                }
@@ -1217,21 +1940,32 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                else {
                                        *code = LDAP_SCHERR_UNEXPTOKEN;
                                        *errp = ss;
+                                       LDAP_FREE(sval);
                                        ldap_attributetype_free(at);
                                        return NULL;
                                }
+                               LDAP_FREE(sval);
                                parse_whsp(&ss);
                        } else if ( sval[0] == 'X' && sval[1] == '-' ) {
                                /* Should be parse_qdstrings */
-                               ssdummy = parse_qdescrs(&ss, code);
-                               if ( !ssdummy ) {
+                               ext_vals = parse_qdescrs(&ss, code);
+                               if ( !ext_vals ) {
                                        *errp = ss;
                                        ldap_attributetype_free(at);
                                        return NULL;
                                }
+                               if ( add_extension(&at->at_extensions,
+                                                   sval, ext_vals) ) {
+                                       *code = LDAP_SCHERR_OUTOFMEM;
+                                       *errp = ss;
+                                       LDAP_FREE(sval);
+                                       ldap_attributetype_free(at);
+                                       return NULL;
+                               }
                        } else {
                                *code = LDAP_SCHERR_UNEXPTOKEN;
                                *errp = ss;
+                               LDAP_FREE(sval);
                                ldap_attributetype_free(at);
                                return NULL;
                        }
@@ -1239,6 +1973,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                default:
                        *code = LDAP_SCHERR_UNEXPTOKEN;
                        *errp = ss;
+                       LDAP_FREE(sval);
                        ldap_attributetype_free(at);
                        return NULL;
                }
@@ -1246,7 +1981,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
 }
 
 void
-ldap_objectclass_free(LDAP_OBJECT_CLASS * oc)
+ldap_objectclass_free(LDAPObjectClass * oc)
 {
        LDAP_FREE(oc->oc_oid);
        LDAP_VFREE(oc->oc_names);
@@ -1254,16 +1989,19 @@ ldap_objectclass_free(LDAP_OBJECT_CLASS * oc)
        LDAP_VFREE(oc->oc_sup_oids);
        LDAP_VFREE(oc->oc_at_oids_must);
        LDAP_VFREE(oc->oc_at_oids_may);
+       free_extensions(oc->oc_extensions);
        LDAP_FREE(oc);
 }
 
-LDAP_OBJECT_CLASS *
-ldap_str2objectclass( const char * s, int * code, const char ** errp )
+LDAPObjectClass *
+ldap_str2objectclass( LDAP_CONST char * s,
+       int * code,
+       LDAP_CONST char ** errp,
+       LDAP_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;
@@ -1271,8 +2009,8 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
        int seen_kind = 0;
        int seen_must = 0;
        int seen_may = 0;
-       LDAP_OBJECT_CLASS * oc;
-       char ** ssdummy;
+       LDAPObjectClass * oc;
+       char ** ext_vals;
        const char * savepos;
 
        if ( !s ) {
@@ -1282,16 +2020,18 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
        }
 
        *errp = s;
-       oc = LDAP_CALLOC(1,sizeof(LDAP_OBJECT_CLASS));
+       oc = LDAP_CALLOC(1,sizeof(LDAPObjectClass));
 
        if ( !oc ) {
                *code = LDAP_SCHERR_OUTOFMEM;
                return NULL;
        }
+       oc->oc_kind = LDAP_SCHEMA_STRUCTURAL;
 
        kind = get_token(&ss,&sval);
        if ( kind != TK_LEFTPAREN ) {
                *code = LDAP_SCHERR_NOLEFTPAREN;
+               LDAP_FREE(sval);
                ldap_objectclass_free(oc);
                return NULL;
        }
@@ -1305,9 +2045,9 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
         */
        parse_whsp(&ss);
        savepos = ss;
-       oc->oc_oid = parse_numericoid(&ss,code);
+       oc->oc_oid = parse_numericoid(&ss,code,0);
        if ( !oc->oc_oid ) {
-               if ( be_liberal ) {
+               if ( (flags & LDAP_SCHEMA_ALLOW_ALL) && (ss == savepos) ) {
                        /* Backtracking */
                        ss = savepos;
                        kind = get_token(&ss,&sval);
@@ -1323,10 +2063,16 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                     !strncmp(sval, "X-", 2) ) {
                                        /* Missing OID, backtrack */
                                        ss = savepos;
-                               } else {
+                               } else if ( flags &
+                                       LDAP_SCHEMA_ALLOW_OID_MACRO ) {
                                        /* Non-numerical OID, ignore */
+                                       int len = ss-savepos;
+                                       oc->oc_oid = LDAP_MALLOC(len+1);
+                                       strncpy(oc->oc_oid, savepos, len);
+                                       oc->oc_oid[len] = 0;
                                }
-                         }
+                       }
+                       LDAP_FREE(sval);
                } else {
                        *errp = ss;
                        ldap_objectclass_free(oc);
@@ -1351,6 +2097,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                        return oc;
                case TK_BAREWORD:
                        if ( !strcmp(sval,"NAME") ) {
+                               LDAP_FREE(sval);
                                if ( seen_name ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1367,6 +2114,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                        return NULL;
                                }
                        } else if ( !strcmp(sval,"DESC") ) {
+                               LDAP_FREE(sval);
                                if ( seen_desc ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1379,12 +2127,14 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                if ( kind != TK_QDSTRING ) {
                                        *code = LDAP_SCHERR_UNEXPTOKEN;
                                        *errp = ss;
+                                       LDAP_FREE(sval);
                                        ldap_objectclass_free(oc);
                                        return NULL;
                                }
                                oc->oc_desc = sval;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"OBSOLETE") ) {
+                               LDAP_FREE(sval);
                                if ( seen_obsolete ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1395,6 +2145,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                oc->oc_obsolete = LDAP_SCHEMA_YES;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"SUP") ) {
+                               LDAP_FREE(sval);
                                if ( seen_sup ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1402,13 +2153,16 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                        return(NULL);
                                }
                                seen_sup = 1;
-                               oc->oc_sup_oids = parse_oids(&ss,code,be_liberal);
+                               oc->oc_sup_oids = parse_oids(&ss,
+                                                            code,
+                                                            flags);
                                if ( !oc->oc_sup_oids ) {
                                        *errp = ss;
                                        ldap_objectclass_free(oc);
                                        return NULL;
                                }
                        } else if ( !strcmp(sval,"ABSTRACT") ) {
+                               LDAP_FREE(sval);
                                if ( seen_kind ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1419,6 +2173,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                oc->oc_kind = LDAP_SCHEMA_ABSTRACT;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"STRUCTURAL") ) {
+                               LDAP_FREE(sval);
                                if ( seen_kind ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1429,6 +2184,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                oc->oc_kind = LDAP_SCHEMA_STRUCTURAL;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"AUXILIARY") ) {
+                               LDAP_FREE(sval);
                                if ( seen_kind ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1439,6 +2195,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                oc->oc_kind = LDAP_SCHEMA_AUXILIARY;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"MUST") ) {
+                               LDAP_FREE(sval);
                                if ( seen_must ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1454,6 +2211,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                }
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"MAY") ) {
+                               LDAP_FREE(sval);
                                if ( seen_may ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1470,15 +2228,24 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                parse_whsp(&ss);
                        } else if ( sval[0] == 'X' && sval[1] == '-' ) {
                                /* Should be parse_qdstrings */
-                               ssdummy = parse_qdescrs(&ss, code);
-                               if ( !ssdummy ) {
+                               ext_vals = parse_qdescrs(&ss, code);
+                               if ( !ext_vals ) {
                                        *errp = ss;
                                        ldap_objectclass_free(oc);
                                        return NULL;
                                }
+                               if ( add_extension(&oc->oc_extensions,
+                                                   sval, ext_vals) ) {
+                                       *code = LDAP_SCHERR_OUTOFMEM;
+                                       *errp = ss;
+                                       LDAP_FREE(sval);
+                                       ldap_objectclass_free(oc);
+                                       return NULL;
+                               }
                        } else {
                                *code = LDAP_SCHERR_UNEXPTOKEN;
                                *errp = ss;
+                               LDAP_FREE(sval);
                                ldap_objectclass_free(oc);
                                return NULL;
                        }
@@ -1486,14 +2253,15 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                default:
                        *code = LDAP_SCHERR_UNEXPTOKEN;
                        *errp = ss;
+                       LDAP_FREE(sval);
                        ldap_objectclass_free(oc);
                        return NULL;
                }
        }
 }
 
-static char *err2text[] = {
-       "",
+static char *const err2text[] = {
+       "Success",
        "Out of memory",
        "Unexpected token",
        "Missing opening parenthesis",
@@ -1509,7 +2277,7 @@ static char *err2text[] = {
 char *
 ldap_scherr2str(int code)
 {
-       if ( code < 1 || code >= (sizeof(err2text)/sizeof(char *)) ) {
+       if ( code < 0 || code >= (sizeof(err2text)/sizeof(char *)) ) {
                return "Unknown error";
        } else {
                return err2text[code];