+/* $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
*/
#include "portable.h"
-#include <ac/ctype.h>
+#include <stdio.h>
+#include <ac/stdlib.h>
+
#include <ac/string.h>
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-#include <lber.h>
-#include <ldap.h>
+#include <ac/time.h>
+
+#include "ldap-int.h"
+
#include <ldap_schema.h>
-#include <stdio.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
- * is extremely boring, we will use a pretection layer that will let
+ * is extremely boring, we will use a protection layer that will let
* us blissfully ignore the error until the end. This layer is
* implemented with the help of the next type.
*/
typedef struct safe_string {
char * val;
- int size;
- int pos;
+ ber_len_t size;
+ ber_len_t pos;
int at_whsp;
} safe_string;
{
safe_string * ss;
- ss = malloc(sizeof(safe_string));
+ ss = LDAP_MALLOC(sizeof(safe_string));
if ( !ss )
return(NULL);
- ss->size = size;
- ss->pos = 0;
- ss->val = malloc(size);
- ss->at_whsp = 0;
+
+ ss->val = LDAP_MALLOC(size);
if ( !ss->val ) {
- free(ss);
+ LDAP_FREE(ss);
return(NULL);
}
+
+ ss->size = size;
+ ss->pos = 0;
+ ss->at_whsp = 0;
+
return ss;
}
-void
+static void
safe_string_free(safe_string * ss)
{
if ( !ss )
return;
- ldap_memfree(ss->val);
- ldap_memfree(ss);
+ LDAP_FREE(ss->val);
+ LDAP_FREE(ss);
}
static char *
safe_string_val(safe_string * ss)
{
+ ss->val[ss->pos] = '\0';
return(ss->val);
}
/* We always make sure there is at least one position available */
if ( ss->pos + l >= ss->size-1 ) {
ss->size *= 2;
- temp = realloc(ss->val, ss->size);
+ 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 */
- free(ss->val);
+ LDAP_FREE(ss->val);
return -1;
}
ss->val = temp;
}
strncpy(&ss->val[ss->pos], s, l);
ss->pos += l;
- if ( ss->pos > 0 && 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;
static int
print_numericoid(safe_string *ss, char *s)
{
- return(append_to_safe_string(ss,s));
+ if ( s )
+ return(append_to_safe_string(ss,s));
+ else
+ return(append_to_safe_string(ss,""));
}
/* This one is identical to print_qdescr */
ret = print_qdescr(ss,*sp);
}
/* If the list was empty, we return zero that is potentially
- * incorrect, but since we will still appending things, the
+ * incorrect, but since we will be still appending things, the
* overflow will be detected later. Maybe FIX.
*/
return(ret);
{
/* The only way to represent an empty list is as a qdescrlist
* so, if the list is empty we treat it as a long list.
- * Really, this is what the syntax mandates.
+ * Really, this is what the syntax mandates. We should not
+ * be here if the list was empty, but if it happens, a label
+ * has already been output and we cannot undo it.
*/
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));
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));
}
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( LDAPSyntax * syn )
+{
+ safe_string * ss;
+ char * retstring;
+
+ ss = new_safe_string(256);
+ if ( !ss )
+ return NULL;
+
+ print_literal(ss,"("/*)*/);
+ print_whsp(ss);
+
+ print_numericoid(ss, syn->syn_oid);
+ print_whsp(ss);
+
+ if ( syn->syn_desc ) {
+ print_literal(ss,"DESC");
+ print_qdstring(ss,syn->syn_desc);
+ }
+
+ print_whsp(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);
+ return(retstring);
+}
+
char *
-ldap_objectclass2str( LDAP_OBJECT_CLASS * oc )
+ldap_objectclass2str( LDAPObjectClass * oc )
{
safe_string * ss;
char * retstring;
if ( !ss )
return NULL;
- print_literal(ss,"(");
+ print_literal(ss,"("/*)*/);
print_whsp(ss);
print_numericoid(ss, oc->oc_oid);
print_qdstring(ss,oc->oc_desc);
}
- if ( oc->oc_obsolete ) {
+ if ( oc->oc_obsolete == LDAP_SCHEMA_YES ) {
print_literal(ss, "OBSOLETE");
print_whsp(ss);
}
if ( oc->oc_sup_oids ) {
print_literal(ss,"SUP");
+ print_whsp(ss);
print_oids(ss,oc->oc_sup_oids);
+ print_whsp(ss);
}
switch (oc->oc_kind) {
- case 0:
+ case LDAP_SCHEMA_ABSTRACT:
print_literal(ss,"ABSTRACT");
break;
- case 1:
+ case LDAP_SCHEMA_STRUCTURAL:
print_literal(ss,"STRUCTURAL");
break;
- case 2:
+ case LDAP_SCHEMA_AUXILIARY:
print_literal(ss,"AUXILIARY");
break;
default:
}
print_whsp(ss);
- print_literal(ss,")");
- retstring = safe_string_val(ss);
+ print_extensions(ss, oc->oc_extensions);
+
+ print_literal(ss, /*(*/")");
+
+ retstring = LDAP_STRDUP(safe_string_val(ss));
safe_string_free(ss);
return(retstring);
}
char *
-ldap_attributetype2str( LDAP_ATTRIBUTE_TYPE * at )
+ldap_attributetype2str( LDAPAttributeType * at )
{
safe_string * ss;
char * retstring;
if ( !ss )
return NULL;
- print_literal(ss,"(");
+ print_literal(ss,"("/*)*/);
print_whsp(ss);
print_numericoid(ss, at->at_oid);
print_qdstring(ss,at->at_desc);
}
- if ( at->at_obsolete ) {
+ if ( at->at_obsolete == LDAP_SCHEMA_YES ) {
print_literal(ss, "OBSOLETE");
print_whsp(ss);
}
if ( at->at_syntax_oid ) {
print_literal(ss,"SYNTAX");
+ print_whsp(ss);
print_noidlen(ss,at->at_syntax_oid,at->at_syntax_len);
+ print_whsp(ss);
}
- if ( at->at_single_value ) {
+ if ( at->at_single_value == LDAP_SCHEMA_YES ) {
print_literal(ss,"SINGLE-VALUE");
print_whsp(ss);
}
- if ( at->at_collective ) {
+ if ( at->at_collective == LDAP_SCHEMA_YES ) {
print_literal(ss,"COLLECTIVE");
print_whsp(ss);
}
- if ( at->at_no_user_mod ) {
+ if ( at->at_no_user_mod == LDAP_SCHEMA_YES ) {
print_literal(ss,"NO-USER-MODIFICATION");
print_whsp(ss);
}
- if ( at->at_usage ) {
+ if ( at->at_usage != LDAP_SCHEMA_USER_APPLICATIONS ) {
print_literal(ss,"USAGE");
print_whsp(ss);
switch (at->at_usage) {
- case 1:
+ case LDAP_SCHEMA_DIRECTORY_OPERATION:
print_literal(ss,"directoryOperation");
break;
- case 2:
+ case LDAP_SCHEMA_DISTRIBUTED_OPERATION:
print_literal(ss,"distributedOperation");
break;
- case 3:
+ case LDAP_SCHEMA_DSA_OPERATION:
print_literal(ss,"dSAOperation");
break;
default:
}
print_whsp(ss);
- print_literal(ss,")");
-
- retstring = safe_string_val(ss);
- safe_string_free(ss);
- return(retstring);
-}
-/*
- * This is ripped from servers/slapd/charray.c that should be promoted
- * to -lldap or something so that it is used everywhere.
- */
-static void
-charray_free( char **array )
-{
- char **a;
+ print_extensions(ss, at->at_extensions);
- if ( array == NULL ) {
- return;
- }
+ print_literal(ss,/*(*/")");
- for ( a = array; *a != NULL; a++ ) {
- if ( *a != NULL ) {
- free( *a );
- }
- }
- free( (char *) array );
+ retstring = LDAP_STRDUP(safe_string_val(ss));
+ safe_string_free(ss);
+ return(retstring);
}
/*
#define TK_QDESCR TK_QDSTRING
struct token {
- int type;
- char *sval;
+ int type;
+ char *sval;
};
static int
-get_token(char ** sp, char ** token_val)
+get_token( const char ** sp, char ** token_val )
{
int kind;
- char * p;
- char * q;
+ const char * p;
+ const char * q;
char * res;
+ *token_val = NULL;
switch (**sp) {
case '\0':
kind = TK_EOS;
(*sp)++;
if ( **sp == '\'' ) {
q = *sp;
- res = malloc(q-p+1);
+ res = LDAP_MALLOC(q-p+1);
if ( !res ) {
kind = TK_OUTOFMEM;
} else {
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 = malloc(q-p+1);
+ res = LDAP_MALLOC(q-p+1);
if ( !res ) {
kind = TK_OUTOFMEM;
} else {
/* Gobble optional whitespace */
static void
-parse_whsp(char **sp)
+parse_whsp(const char **sp)
{
- while (isspace(**sp))
+ while (LDAP_SPACE(**sp))
(*sp)++;
}
*/
/* Parse a sequence of dot-separated decimal strings */
-static char *
-parse_numericoid(char **sp, int *code)
+char *
+parse_numericoid(const char **sp, int *code, const int flags)
{
char * res;
- char * start = *sp;
+ const char * start = *sp;
int len;
+ int quoted = 0;
- /* Each iteration of this loops gets one decimal string */
+ /* 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) ) {
- /* Initial char is not a digit or char after dot is not a digit */
+ if ( !LDAP_DIGIT(**sp) ) {
+ /*
+ * Initial char is not a digit or char after dot is
+ * not a digit
+ */
*code = LDAP_SCHERR_NODIGIT;
return NULL;
}
(*sp)++;
- while ( isdigit(**sp) )
+ while ( LDAP_DIGIT(**sp) )
(*sp)++;
if ( **sp != '.' )
break;
/* Otherwise, gobble the dot and loop again */
(*sp)++;
}
- /* At this point, *sp points at the char past the numericoid. Perfect. */
+ /* Now *sp points at the char past the numericoid. Perfect. */
len = *sp - start;
- res = malloc(len+1);
+ res = LDAP_MALLOC(len+1);
if (!res) {
- *code = LDAP_SCHERR_OUTOFMEM;
- return(NULL);
+ *code = LDAP_SCHERR_OUTOFMEM;
+ return(NULL);
}
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);
}
/* Parse a qdescr or a list of them enclosed in () */
static char **
-parse_qdescrs(char **sp, int *code)
+parse_qdescrs(const char **sp, int *code)
{
char ** res;
char ** res1;
if ( kind == TK_LEFTPAREN ) {
/* Let's presume there will be at least 2 entries */
size = 3;
- res = calloc(3,sizeof(char *));
+ res = LDAP_CALLOC(3,sizeof(char *));
if ( !res ) {
*code = LDAP_SCHERR_OUTOFMEM;
return NULL;
if ( kind == TK_QDESCR ) {
if ( pos == size-2 ) {
size++;
- res1 = realloc(res,size*sizeof(char *));
+ res1 = LDAP_REALLOC(res,size*sizeof(char *));
if ( !res1 ) {
- charray_free(res);
+ LDAP_VFREE(res);
+ LDAP_FREE(sval);
*code = LDAP_SCHERR_OUTOFMEM;
return(NULL);
}
pos++;
parse_whsp(sp);
} else {
- charray_free(res);
+ LDAP_VFREE(res);
+ LDAP_FREE(sval);
*code = LDAP_SCHERR_UNEXPTOKEN;
return(NULL);
}
parse_whsp(sp);
return(res);
} else if ( kind == TK_QDESCR ) {
- res = calloc(2,sizeof(char *));
+ res = LDAP_CALLOC(2,sizeof(char *));
if ( !res ) {
*code = LDAP_SCHERR_OUTOFMEM;
return NULL;
parse_whsp(sp);
return res;
} else {
+ LDAP_FREE(sval);
*code = LDAP_SCHERR_BADNAME;
return NULL;
}
/* Parse a woid */
static char *
-parse_woid(char **sp, int *code)
+parse_woid(const char **sp, int *code)
{
char * sval;
int kind;
parse_whsp(sp);
kind = get_token(sp, &sval);
if ( kind != TK_BAREWORD ) {
+ LDAP_FREE(sval);
*code = LDAP_SCHERR_UNEXPTOKEN;
return NULL;
}
/* Parse a noidlen */
static char *
-parse_noidlen(char **sp, int *code, int *len)
+parse_noidlen(const char **sp, int *code, int *len, int allow_quoted)
{
char * sval;
- int kind;
+ int quoted = 0;
*len = 0;
- kind = get_token(sp, &sval);
- if ( kind != TK_BAREWORD ) {
- *code = LDAP_SCHERR_UNEXPTOKEN;
+ /* Netscape puts the SYNTAX value in quotes (incorrectly) */
+ if ( allow_quoted && **sp == '\'' ) {
+ quoted = 1;
+ (*sp)++;
+ }
+ sval = parse_numericoid(sp, code, 0);
+ if ( !sval ) {
return NULL;
}
- if ( **sp == '{' ) {
+ if ( **sp == '{' /*}*/ ) {
(*sp)++;
- *len = atoi(**sp);
- while ( isdigit(**sp) )
+ *len = atoi(*sp);
+ while ( LDAP_DIGIT(**sp) )
(*sp)++;
- (*sp)++;
- if ( **sp != '}' ) {
+ if ( **sp != /*{*/ '}' ) {
*code = LDAP_SCHERR_UNEXPTOKEN;
- ldap_memfree(sval);
+ LDAP_FREE(sval);
return NULL;
}
(*sp)++;
}
+ if ( allow_quoted && quoted ) {
+ if ( **sp == '\'' ) {
+ (*sp)++;
+ } else {
+ *code = LDAP_SCHERR_UNEXPTOKEN;
+ LDAP_FREE(sval);
+ return NULL;
+ }
+ }
return sval;
}
+/*
+ * Next routine will accept a qdstring in place of an oid if
+ * 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(char **sp, int *code)
+parse_oids(const char **sp, int *code, const int allow_quoted)
{
char ** res;
char ** res1;
/*
* Strictly speaking, doing this here accepts whsp before the
- * ( at the begining of an oidlist, but his is harmless. Also,
+ * ( at the begining of an oidlist, but this is harmless. Also,
* we are very liberal in what we accept as an OID. Maybe
* refine later.
*/
if ( kind == TK_LEFTPAREN ) {
/* Let's presume there will be at least 2 entries */
size = 3;
- res = calloc(3,sizeof(char *));
+ res = LDAP_CALLOC(3,sizeof(char *));
if ( !res ) {
*code = LDAP_SCHERR_OUTOFMEM;
return NULL;
pos = 0;
parse_whsp(sp);
kind = get_token(sp,&sval);
- if ( kind == TK_BAREWORD ) {
+ if ( kind == TK_BAREWORD ||
+ ( allow_quoted && kind == TK_QDSTRING ) ) {
res[pos] = sval;
pos++;
} else {
*code = LDAP_SCHERR_UNEXPTOKEN;
- charray_free(res);
+ LDAP_FREE(sval);
+ LDAP_VFREE(res);
return NULL;
}
parse_whsp(sp);
if ( kind == TK_DOLLAR ) {
parse_whsp(sp);
kind = get_token(sp,&sval);
- if ( kind == TK_BAREWORD ) {
+ if ( kind == TK_BAREWORD ||
+ ( allow_quoted &&
+ kind == TK_QDSTRING ) ) {
if ( pos == size-2 ) {
size++;
- res1 = realloc(res,size*sizeof(char *));
+ res1 = LDAP_REALLOC(res,size*sizeof(char *));
if ( !res1 ) {
- charray_free(res);
- *code = LDAP_SCHERR_OUTOFMEM;
- return(NULL);
+ LDAP_FREE(sval);
+ LDAP_VFREE(res);
+ *code = LDAP_SCHERR_OUTOFMEM;
+ return(NULL);
}
res = res1;
}
pos++;
} else {
*code = LDAP_SCHERR_UNEXPTOKEN;
- charray_free(res);
+ LDAP_FREE(sval);
+ LDAP_VFREE(res);
return NULL;
}
parse_whsp(sp);
} else {
*code = LDAP_SCHERR_UNEXPTOKEN;
- charray_free(res);
+ LDAP_FREE(sval);
+ LDAP_VFREE(res);
return NULL;
}
}
res[pos] = NULL;
parse_whsp(sp);
return(res);
- } else if ( kind == TK_BAREWORD ) {
- res = calloc(2,sizeof(char *));
+ } else if ( kind == TK_BAREWORD ||
+ ( allow_quoted && kind == TK_QDSTRING ) ) {
+ res = LDAP_CALLOC(2,sizeof(char *));
if ( !res ) {
+ LDAP_FREE(sval);
*code = LDAP_SCHERR_OUTOFMEM;
return NULL;
}
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_at(LDAP_ATTRIBUTE_TYPE * at)
+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( LDAPSyntax * syn )
{
- ldap_memfree(at->at_oid);
- charray_free(at->at_names);
- ldap_memfree(at->at_desc);
- ldap_memfree(at->at_sup_oid);
- ldap_memfree(at->at_equality_oid);
- ldap_memfree(at->at_ordering_oid);
- ldap_memfree(at->at_substr_oid);
- ldap_memfree(at->at_syntax_oid);
- ldap_memfree(at);
+ LDAP_FREE(syn->syn_oid);
+ LDAP_VFREE(syn->syn_names);
+ LDAP_FREE(syn->syn_desc);
+ free_extensions(syn->syn_extensions);
+ LDAP_FREE(syn);
}
-LDAP_ATTRIBUTE_TYPE *
-ldap_str2attributetype( char * s, int * code, char ** errp )
+LDAPSyntax *
+ldap_str2syntax( LDAP_CONST char * s,
+ int * code,
+ LDAP_CONST char ** errp,
+ LDAP_CONST int flags )
{
int kind;
- char * ss = s;
+ const char * ss = s;
char * sval;
int seen_name = 0;
int seen_desc = 0;
- int seen_obsolete = 0;
- int seen_sup = 0;
- int seen_equality = 0;
- int seen_ordering = 0;
- 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;
+ LDAPSyntax * syn;
+ char ** ext_vals;
+
+ if ( !s ) {
+ *code = LDAP_SCHERR_EMPTY;
+ *errp = "";
+ return NULL;
+ }
*errp = s;
- at = calloc(1,sizeof(LDAP_ATTRIBUTE_TYPE));
+ syn = LDAP_CALLOC(1,sizeof(LDAPSyntax));
- if ( !at ) {
+ if ( !syn ) {
*code = LDAP_SCHERR_OUTOFMEM;
return NULL;
}
kind = get_token(&ss,&sval);
if ( kind != TK_LEFTPAREN ) {
+ LDAP_FREE(sval);
*code = LDAP_SCHERR_NOLEFTPAREN;
- free_at(at);
+ ldap_syntax_free(syn);
return NULL;
}
parse_whsp(&ss);
- at->at_oid = parse_numericoid(&ss,code);
- if ( !at->at_oid ) {
+ syn->syn_oid = parse_numericoid(&ss,code,0);
+ if ( !syn->syn_oid ) {
*errp = ss;
- free_at(at);
+ ldap_syntax_free(syn);
return NULL;
}
parse_whsp(&ss);
/*
- * Beyond this point we will be liberal an accept the items
+ * Beyond this point we will be liberal and accept the items
* in any order.
*/
while (1) {
case TK_EOS:
*code = LDAP_SCHERR_NORIGHTPAREN;
*errp = ss;
- free_at(at);
+ ldap_syntax_free(syn);
return NULL;
case TK_RIGHTPAREN:
- return at;
+ return syn;
case TK_BAREWORD:
if ( !strcmp(sval,"NAME") ) {
+ LDAP_FREE(sval);
if ( seen_name ) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
- free_at(at);
+ ldap_syntax_free(syn);
return(NULL);
}
seen_name = 1;
- at->at_names = parse_qdescrs(&ss,code);
- if ( !at->at_names ) {
+ syn->syn_names = parse_qdescrs(&ss,code);
+ if ( !syn->syn_names ) {
if ( *code != LDAP_SCHERR_OUTOFMEM )
*code = LDAP_SCHERR_BADNAME;
*errp = ss;
- free_at(at);
+ ldap_syntax_free(syn);
return NULL;
}
} else if ( !strcmp(sval,"DESC") ) {
+ LDAP_FREE(sval);
if ( seen_desc ) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
- free_at(at);
+ ldap_syntax_free(syn);
return(NULL);
}
seen_desc = 1;
if ( kind != TK_QDSTRING ) {
*code = LDAP_SCHERR_UNEXPTOKEN;
*errp = ss;
- free_at(at);
+ LDAP_FREE(sval);
+ ldap_syntax_free(syn);
return NULL;
}
- at->at_desc = sval;
- parse_whsp(&ss);
- } else if ( !strcmp(sval,"OBSOLETE") ) {
- if ( seen_obsolete ) {
- *code = LDAP_SCHERR_DUPOPT;
- *errp = ss;
- free_at(at);
- return(NULL);
- }
- seen_obsolete = 1;
- at->at_obsolete = 1;
+ syn->syn_desc = sval;
parse_whsp(&ss);
- } else if ( !strcmp(sval,"SUP") ) {
- if ( seen_sup ) {
- *code = LDAP_SCHERR_DUPOPT;
- *errp = ss;
- free_at(at);
- return(NULL);
- }
- seen_sup = 1;
- at->at_sup_oid = parse_woid(&ss,code);
- if ( !at->at_sup_oid ) {
+ } else if ( sval[0] == 'X' && sval[1] == '-' ) {
+ /* Should be parse_qdstrings */
+ ext_vals = parse_qdescrs(&ss, code);
+ if ( !ext_vals ) {
*errp = ss;
- free_at(at);
+ ldap_syntax_free(syn);
return NULL;
}
- } else if ( !strcmp(sval,"EQUALITY") ) {
- if ( seen_equality ) {
- *code = LDAP_SCHERR_DUPOPT;
+ if ( add_extension(&syn->syn_extensions,
+ sval, ext_vals) ) {
+ *code = LDAP_SCHERR_OUTOFMEM;
*errp = ss;
- free_at(at);
- return(NULL);
+ 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;
+ }
+ break;
+ default:
+ *code = LDAP_SCHERR_UNEXPTOKEN;
+ *errp = ss;
+ LDAP_FREE(sval);
+ ldap_syntax_free(syn);
+ return NULL;
+ }
+ }
+}
+
+void
+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);
+ LDAP_FREE(at->at_desc);
+ LDAP_FREE(at->at_sup_oid);
+ LDAP_FREE(at->at_equality_oid);
+ 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);
+}
+
+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 seen_name = 0;
+ int seen_desc = 0;
+ int seen_obsolete = 0;
+ int seen_sup = 0;
+ int seen_equality = 0;
+ int seen_ordering = 0;
+ int seen_substr = 0;
+ int seen_syntax = 0;
+ int seen_usage = 0;
+ LDAPAttributeType * at;
+ char ** ext_vals;
+ const char * savepos;
+
+ if ( !s ) {
+ *code = LDAP_SCHERR_EMPTY;
+ *errp = "";
+ return NULL;
+ }
+
+ *errp = s;
+ at = LDAP_CALLOC(1,sizeof(LDAPAttributeType));
+
+ if ( !at ) {
+ *code = LDAP_SCHERR_OUTOFMEM;
+ return NULL;
+ }
+
+ kind = get_token(&ss,&sval);
+ if ( kind != TK_LEFTPAREN ) {
+ *code = LDAP_SCHERR_NOLEFTPAREN;
+ LDAP_FREE(sval);
+ ldap_attributetype_free(at);
+ return NULL;
+ }
+
+ /*
+ * Definitions MUST begin with an OID in the numericoid format.
+ * However, this routine is used by clients to parse the response
+ * from servers and very well known servers will provide an OID
+ * in the wrong format or even no OID at all. We do our best to
+ * extract info from those servers.
+ */
+ parse_whsp(&ss);
+ savepos = ss;
+ at->at_oid = parse_numericoid(&ss,code,0);
+ if ( !at->at_oid ) {
+ if ( ( flags & ( LDAP_SCHEMA_ALLOW_NO_OID
+ | LDAP_SCHEMA_ALLOW_OID_MACRO ) )
+ && (ss == savepos) ) {
+ /* Backtracking */
+ ss = savepos;
+ kind = get_token(&ss,&sval);
+ if ( kind == TK_BAREWORD ) {
+ if ( !strcmp(sval, "NAME") ||
+ !strcmp(sval, "DESC") ||
+ !strcmp(sval, "OBSOLETE") ||
+ !strcmp(sval, "SUP") ||
+ !strcmp(sval, "EQUALITY") ||
+ !strcmp(sval, "ORDERING") ||
+ !strcmp(sval, "SUBSTR") ||
+ !strcmp(sval, "SYNTAX") ||
+ !strcmp(sval, "SINGLE-VALUE") ||
+ !strcmp(sval, "COLLECTIVE") ||
+ !strcmp(sval, "NO-USER-MODIFICATION") ||
+ !strcmp(sval, "USAGE") ||
+ !strncmp(sval, "X-", 2) ) {
+ /* Missing OID, backtrack */
+ ss = savepos;
+ } 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);
+ 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_attributetype_free(at);
+ return NULL;
+ case TK_RIGHTPAREN:
+ return at;
+ case TK_BAREWORD:
+ if ( !strcmp(sval,"NAME") ) {
+ LDAP_FREE(sval);
+ if ( seen_name ) {
+ *code = LDAP_SCHERR_DUPOPT;
+ *errp = ss;
+ ldap_attributetype_free(at);
+ return(NULL);
+ }
+ seen_name = 1;
+ at->at_names = parse_qdescrs(&ss,code);
+ if ( !at->at_names ) {
+ if ( *code != LDAP_SCHERR_OUTOFMEM )
+ *code = LDAP_SCHERR_BADNAME;
+ *errp = ss;
+ ldap_attributetype_free(at);
+ return NULL;
+ }
+ } else if ( !strcmp(sval,"DESC") ) {
+ LDAP_FREE(sval);
+ if ( seen_desc ) {
+ *code = LDAP_SCHERR_DUPOPT;
+ *errp = ss;
+ ldap_attributetype_free(at);
+ 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_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;
+ ldap_attributetype_free(at);
+ return(NULL);
+ }
+ seen_obsolete = 1;
+ 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;
+ ldap_attributetype_free(at);
+ return(NULL);
+ }
+ seen_sup = 1;
+ at->at_sup_oid = parse_woid(&ss,code);
+ if ( !at->at_sup_oid ) {
+ *errp = ss;
+ ldap_attributetype_free(at);
+ return NULL;
+ }
+ } else if ( !strcmp(sval,"EQUALITY") ) {
+ LDAP_FREE(sval);
+ if ( seen_equality ) {
+ *code = LDAP_SCHERR_DUPOPT;
+ *errp = ss;
+ ldap_attributetype_free(at);
+ return(NULL);
}
seen_equality = 1;
at->at_equality_oid = parse_woid(&ss,code);
if ( !at->at_equality_oid ) {
*errp = ss;
- free_at(at);
+ ldap_attributetype_free(at);
return NULL;
}
} else if ( !strcmp(sval,"ORDERING") ) {
+ LDAP_FREE(sval);
if ( seen_ordering ) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
- free_at(at);
+ ldap_attributetype_free(at);
return(NULL);
}
seen_ordering = 1;
at->at_ordering_oid = parse_woid(&ss,code);
if ( !at->at_ordering_oid ) {
*errp = ss;
- free_at(at);
+ ldap_attributetype_free(at);
return NULL;
}
} else if ( !strcmp(sval,"SUBSTR") ) {
+ LDAP_FREE(sval);
if ( seen_substr ) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
- free_at(at);
+ ldap_attributetype_free(at);
return(NULL);
}
seen_substr = 1;
at->at_substr_oid = parse_woid(&ss,code);
if ( !at->at_substr_oid ) {
*errp = ss;
- free_at(at);
+ ldap_attributetype_free(at);
return NULL;
}
} else if ( !strcmp(sval,"SYNTAX") ) {
+ LDAP_FREE(sval);
if ( seen_syntax ) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
- free_at(at);
+ ldap_attributetype_free(at);
return(NULL);
}
seen_syntax = 1;
parse_whsp(&ss);
- at->at_syntax_oid = parse_noidlen(&ss,code,&at->at_syntax_len);
+ 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;
- free_at(at);
+ 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;
- free_at(at);
+ ldap_attributetype_free(at);
return(NULL);
}
- at->at_single_value = 1;
+ 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;
- free_at(at);
+ ldap_attributetype_free(at);
return(NULL);
}
- at->at_collective = 1;
+ 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;
- free_at(at);
+ ldap_attributetype_free(at);
return(NULL);
}
- at->at_no_user_mod = 1;
+ 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;
- free_at(at);
+ ldap_attributetype_free(at);
return(NULL);
}
seen_usage = 1;
if ( kind != TK_BAREWORD ) {
*code = LDAP_SCHERR_UNEXPTOKEN;
*errp = ss;
- free_at(at);
+ LDAP_FREE(sval);
+ ldap_attributetype_free(at);
return NULL;
}
if ( !strcasecmp(sval,"userApplications") )
- at->at_usage = 0;
+ at->at_usage =
+ LDAP_SCHEMA_USER_APPLICATIONS;
else if ( !strcasecmp(sval,"directoryOperation") )
- at->at_usage = 1;
+ at->at_usage =
+ LDAP_SCHEMA_DIRECTORY_OPERATION;
else if ( !strcasecmp(sval,"distributedOperation") )
- at->at_usage = 2;
+ at->at_usage =
+ LDAP_SCHEMA_DISTRIBUTED_OPERATION;
else if ( !strcasecmp(sval,"dSAOperation") )
- at->at_usage = 3;
+ at->at_usage =
+ LDAP_SCHEMA_DSA_OPERATION;
else {
*code = LDAP_SCHERR_UNEXPTOKEN;
*errp = ss;
- free_at(at);
+ 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 */
+ 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;
- free_at(at);
+ LDAP_FREE(sval);
+ ldap_attributetype_free(at);
return NULL;
}
break;
default:
*code = LDAP_SCHERR_UNEXPTOKEN;
*errp = ss;
- free_at(at);
+ LDAP_FREE(sval);
+ ldap_attributetype_free(at);
return NULL;
}
}
}
-static void
-free_oc(LDAP_OBJECT_CLASS * oc)
+void
+ldap_objectclass_free(LDAPObjectClass * oc)
{
- ldap_memfree(oc->oc_oid);
- charray_free(oc->oc_names);
- ldap_memfree(oc->oc_desc);
- charray_free(oc->oc_sup_oids);
- charray_free(oc->oc_at_oids_must);
- charray_free(oc->oc_at_oids_may);
- ldap_memfree(oc);
+ LDAP_FREE(oc->oc_oid);
+ LDAP_VFREE(oc->oc_names);
+ LDAP_FREE(oc->oc_desc);
+ 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( char * s, int * code, char ** errp )
+LDAPObjectClass *
+ldap_str2objectclass( LDAP_CONST char * s,
+ int * code,
+ LDAP_CONST char ** errp,
+ LDAP_CONST int flags )
{
int kind;
- char * ss = s;
+ const char * ss = s;
char * sval;
int seen_name = 0;
int seen_desc = 0;
int seen_kind = 0;
int seen_must = 0;
int seen_may = 0;
- LDAP_OBJECT_CLASS * oc;
+ LDAPObjectClass * oc;
+ char ** ext_vals;
+ const char * savepos;
+
+ if ( !s ) {
+ *code = LDAP_SCHERR_EMPTY;
+ *errp = "";
+ return NULL;
+ }
*errp = s;
- oc = 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;
- free_oc(oc);
+ LDAP_FREE(sval);
+ ldap_objectclass_free(oc);
return NULL;
}
+ /*
+ * Definitions MUST begin with an OID in the numericoid format.
+ * However, this routine is used by clients to parse the response
+ * from servers and very well known servers will provide an OID
+ * in the wrong format or even no OID at all. We do our best to
+ * extract info from those servers.
+ */
parse_whsp(&ss);
- oc->oc_oid = parse_numericoid(&ss,code);
+ savepos = ss;
+ oc->oc_oid = parse_numericoid(&ss,code,0);
if ( !oc->oc_oid ) {
- *errp = ss;
- free_oc(oc);
- return NULL;
+ if ( (flags & LDAP_SCHEMA_ALLOW_ALL) && (ss == savepos) ) {
+ /* Backtracking */
+ ss = savepos;
+ kind = get_token(&ss,&sval);
+ if ( kind == TK_BAREWORD ) {
+ if ( !strcmp(sval, "NAME") ||
+ !strcmp(sval, "DESC") ||
+ !strcmp(sval, "OBSOLETE") ||
+ !strcmp(sval, "SUP") ||
+ !strcmp(sval, "ABSTRACT") ||
+ !strcmp(sval, "STRUCTURAL") ||
+ !strcmp(sval, "AUXILIARY") ||
+ !strcmp(sval, "MUST") ||
+ !strncmp(sval, "X-", 2) ) {
+ /* Missing OID, backtrack */
+ ss = savepos;
+ } 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);
+ return NULL;
+ }
}
parse_whsp(&ss);
case TK_EOS:
*code = LDAP_SCHERR_NORIGHTPAREN;
*errp = ss;
- free_oc(oc);
+ ldap_objectclass_free(oc);
return NULL;
case TK_RIGHTPAREN:
return oc;
case TK_BAREWORD:
if ( !strcmp(sval,"NAME") ) {
+ LDAP_FREE(sval);
if ( seen_name ) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
- free_oc(oc);
+ ldap_objectclass_free(oc);
return(NULL);
}
seen_name = 1;
if ( *code != LDAP_SCHERR_OUTOFMEM )
*code = LDAP_SCHERR_BADNAME;
*errp = ss;
- free_oc(oc);
+ ldap_objectclass_free(oc);
return NULL;
}
} else if ( !strcmp(sval,"DESC") ) {
+ LDAP_FREE(sval);
if ( seen_desc ) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
- free_oc(oc);
+ ldap_objectclass_free(oc);
return(NULL);
}
seen_desc = 1;
if ( kind != TK_QDSTRING ) {
*code = LDAP_SCHERR_UNEXPTOKEN;
*errp = ss;
- free_oc(oc);
+ 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;
- free_oc(oc);
+ ldap_objectclass_free(oc);
return(NULL);
}
seen_obsolete = 1;
- oc->oc_obsolete = 1;
+ 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;
- free_oc(oc);
+ ldap_objectclass_free(oc);
return(NULL);
}
seen_sup = 1;
- /* Netscape DS is broken or I have not
- understood the syntax. */
- /* oc->oc_sup_oids = parse_oids(&ss,code); */
- oc->oc_sup_oids = parse_qdescrs(&ss,code);
+ oc->oc_sup_oids = parse_oids(&ss,
+ code,
+ flags);
if ( !oc->oc_sup_oids ) {
*errp = ss;
- free_oc(oc);
+ ldap_objectclass_free(oc);
return NULL;
}
} else if ( !strcmp(sval,"ABSTRACT") ) {
+ LDAP_FREE(sval);
if ( seen_kind ) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
- free_oc(oc);
+ ldap_objectclass_free(oc);
return(NULL);
}
seen_kind = 1;
- oc->oc_kind = 0;
+ 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;
- free_oc(oc);
+ ldap_objectclass_free(oc);
return(NULL);
}
seen_kind = 1;
- oc->oc_kind = 1;
+ 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;
- free_oc(oc);
+ ldap_objectclass_free(oc);
return(NULL);
}
seen_kind = 1;
- oc->oc_kind = 2;
+ 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;
- free_oc(oc);
+ ldap_objectclass_free(oc);
return(NULL);
}
seen_must = 1;
- oc->oc_at_oids_must = parse_oids(&ss,code);
+ oc->oc_at_oids_must = parse_oids(&ss,code,0);
if ( !oc->oc_at_oids_must ) {
*errp = ss;
- free_oc(oc);
+ ldap_objectclass_free(oc);
return NULL;
}
parse_whsp(&ss);
} else if ( !strcmp(sval,"MAY") ) {
+ LDAP_FREE(sval);
if ( seen_may ) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
- free_oc(oc);
+ ldap_objectclass_free(oc);
return(NULL);
}
seen_may = 1;
- oc->oc_at_oids_may = parse_oids(&ss,code);
+ oc->oc_at_oids_may = parse_oids(&ss,code,0);
if ( !oc->oc_at_oids_may ) {
*errp = ss;
- free_oc(oc);
+ ldap_objectclass_free(oc);
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_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;
- free_oc(oc);
+ LDAP_FREE(sval);
+ ldap_objectclass_free(oc);
return NULL;
}
break;
default:
*code = LDAP_SCHERR_UNEXPTOKEN;
*errp = ss;
- free_oc(oc);
+ 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",
"Expecting a name",
"Bad description",
"Bad superiors",
- "Duplicate option"
+ "Duplicate option",
+ "Unexpected end of data"
};
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];
projects / openldap / blobdiff