X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsyntax.c;h=bd4b3c48cf5dc786de183658483f058c88941fd2;hb=e3e7a22b5d7c6410ab54c31038fc153dadc8ca66;hp=85025683ecc652998ec38f94043c65f92345a400;hpb=c890c96d13c53cf0fa1d9580fea2ab47a2c8caa9;p=openldap

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index 85025683ec..bd4b3c48cf 100644
--- a/servers/slapd/syntax.c
+++ b/servers/slapd/syntax.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,8 +30,11 @@ struct sindexrec {
 };
 
 static Avlnode	*syn_index = NULL;
-static LDAP_SLIST_HEAD(SyntaxList, Syntax) syn_list
-	= LDAP_SLIST_HEAD_INITIALIZER(&syn_list);
+static LDAP_STAILQ_HEAD(SyntaxList, Syntax) syn_list
+	= LDAP_STAILQ_HEAD_INITIALIZER(syn_list);
+
+/* Last hardcoded attribute registered */
+Syntax *syn_sys_tail;
 
 static int
 syn_index_cmp(
@@ -68,7 +71,7 @@ syn_find_desc( const char *syndesc, int *len )
 {
 	Syntax		*synp;
 
-	LDAP_SLIST_FOREACH(synp, &syn_list, ssyn_next) {
+	LDAP_STAILQ_FOREACH(synp, &syn_list, ssyn_next) {
 		if ((*len = dscompare( synp->ssyn_syn.syn_desc, syndesc, '{' /*'}'*/ ))) {
 			return synp;
 		}
@@ -111,9 +114,9 @@ syn_destroy( void )
 	Syntax	*s;
 
 	avl_free( syn_index, ldap_memfree );
-	while( !LDAP_SLIST_EMPTY( &syn_list ) ) {
-		s = LDAP_SLIST_FIRST( &syn_list );
-		LDAP_SLIST_REMOVE_HEAD( &syn_list, ssyn_next );
+	while( !LDAP_STAILQ_EMPTY( &syn_list ) ) {
+		s = LDAP_STAILQ_FIRST( &syn_list );
+		LDAP_STAILQ_REMOVE_HEAD( &syn_list, ssyn_next );
 		if ( s->ssyn_sups ) {
 			SLAP_FREE( s->ssyn_sups );
 		}
@@ -123,14 +126,13 @@ syn_destroy( void )
 
 static int
 syn_insert(
-    Syntax		*ssyn,
-    const char		**err
-)
+	Syntax		*ssyn,
+	Syntax		*prev,
+	const char	**err )
 {
 	struct sindexrec	*sir;
 
-	LDAP_SLIST_NEXT( ssyn, ssyn_next ) = NULL;
-	LDAP_SLIST_INSERT_HEAD( &syn_list, ssyn, ssyn_next );
+	LDAP_STAILQ_NEXT( ssyn, ssyn_next ) = NULL;
  
 	if ( ssyn->ssyn_oid ) {
 		sir = (struct sindexrec *)
@@ -150,19 +152,36 @@ syn_insert(
 		/* FIX: temporal consistency check */
 		syn_find(sir->sir_name);
 	}
+
+	if ( ssyn->ssyn_flags & SLAP_AT_HARDCODE ) {
+		prev = syn_sys_tail;
+		syn_sys_tail = ssyn;
+	}
+
+	if ( prev ) {
+		LDAP_STAILQ_INSERT_AFTER( &syn_list, prev, ssyn, ssyn_next );
+	} else {
+		LDAP_STAILQ_INSERT_TAIL( &syn_list, ssyn, ssyn_next );
+	}
 	return 0;
 }
 
 int
 syn_add(
-    LDAPSyntax		*syn,
-    slap_syntax_defs_rec *def,
-    const char		**err
-)
+	LDAPSyntax		*syn,
+	int			user,
+	slap_syntax_defs_rec	*def,
+	Syntax			**ssynp,
+	Syntax			*prev,
+	const char		**err )
 {
 	Syntax		*ssyn;
 	int		code = 0;
 
+	if ( ssynp != NULL ) {
+		*ssynp = NULL;
+	}
+
 	ssyn = (Syntax *) SLAP_CALLOC( 1, sizeof(Syntax) );
 	if ( ssyn == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "SLAP_CALLOC Error\n", 0, 0, 0 );
@@ -171,7 +190,7 @@ syn_add(
 
 	AC_MEMCPY( &ssyn->ssyn_syn, syn, sizeof(LDAPSyntax) );
 
-	LDAP_SLIST_NEXT(ssyn,ssyn_next) = NULL;
+	LDAP_STAILQ_NEXT(ssyn,ssyn_next) = NULL;
 
 	/*
 	 * note: ssyn_bvoid uses the same memory of ssyn_syn.syn_oid;
@@ -190,6 +209,47 @@ syn_add(
 	ssyn->ssyn_str2ber = def->sd_str2ber;
 #endif
 
+	if ( def->sd_validate == NULL && def->sd_pretty == NULL && syn->syn_extensions != NULL ) {
+		LDAPSchemaExtensionItem **lsei;
+		Syntax *subst = NULL;
+
+		for ( lsei = syn->syn_extensions; *lsei != NULL; lsei++) {
+			if ( strcmp( (*lsei)->lsei_name, "X-SUBST" ) != 0 ) {
+				continue;
+			}
+
+			assert( (*lsei)->lsei_values != NULL );
+			if ( (*lsei)->lsei_values[0] == '\0'
+				|| (*lsei)->lsei_values[1] != '\0' )
+			{
+				Debug( LDAP_DEBUG_ANY, "syn_add(%s): exactly one substitute syntax must be present\n",
+					ssyn->ssyn_syn.syn_oid, 0, 0 );
+				return SLAP_SCHERR_SYN_SUBST_NOT_SPECIFIED;
+			}
+
+			subst = syn_find( (*lsei)->lsei_values[0] );
+			if ( subst == NULL ) {
+				Debug( LDAP_DEBUG_ANY, "syn_add(%s): substitute syntax %s not found\n",
+					ssyn->ssyn_syn.syn_oid, (*lsei)->lsei_values[0], 0 );
+				return SLAP_SCHERR_SYN_SUBST_NOT_FOUND;
+			}
+			break;
+		}
+
+		if ( subst != NULL ) {
+			ssyn->ssyn_flags = subst->ssyn_flags;
+			ssyn->ssyn_validate = subst->ssyn_validate;
+			ssyn->ssyn_pretty = subst->ssyn_pretty;
+
+			ssyn->ssyn_sups = NULL;
+
+#ifdef SLAPD_BINARY_CONVERSION
+			ssyn->ssyn_ber2str = subst->ssyn_ber2str;
+			ssyn->ssyn_str2ber = subst->ssyn_str2ber;
+#endif
+		}
+	}
+
 	if ( def->sd_sups != NULL ) {
 		int	cnt;
 
@@ -213,9 +273,11 @@ syn_add(
 		}
 	}
 
-	if ( code == 0 ) {
-		code = syn_insert( ssyn, err );
+	if ( !user )
+		ssyn->ssyn_flags |= SLAP_SYNTAX_HARDCODE;
 
+	if ( code == 0 ) {
+		code = syn_insert( ssyn, prev, err );
 	}
 
 	if ( code != 0 && ssyn != NULL ) {
@@ -223,6 +285,11 @@ syn_add(
 			SLAP_FREE( ssyn->ssyn_sups );
 		}
 		SLAP_FREE( ssyn );
+		ssyn = NULL;
+	}
+
+	if (ssynp ) {
+		*ssynp = ssyn;
 	}
 
 	return code;
@@ -244,7 +311,7 @@ register_syntax(
 		return( -1 );
 	}
 
-	code = syn_add( syn, def, &err );
+	code = syn_add( syn, 0, def, NULL, NULL, &err );
 
 	if ( code ) {
 		Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s %s in %s\n",
@@ -267,7 +334,7 @@ syn_schema_info( Entry *e )
 	struct berval	val;
 	struct berval	nval;
 
-	LDAP_SLIST_FOREACH(syn, &syn_list, ssyn_next ) {
+	LDAP_STAILQ_FOREACH(syn, &syn_list, ssyn_next ) {
 		if ( ! syn->ssyn_validate ) {
 			/* skip syntaxes without validators */
 			continue;
@@ -297,3 +364,92 @@ syn_schema_info( Entry *e )
 	return 0;
 }
 
+void
+syn_delete( Syntax *syn )
+{
+	LDAP_STAILQ_REMOVE(&syn_list, syn, Syntax, ssyn_next);
+}
+
+int
+syn_start( Syntax **syn )
+{
+	assert( syn != NULL );
+
+	*syn = LDAP_STAILQ_FIRST(&syn_list);
+
+	return (*syn != NULL);
+}
+
+int
+syn_next( Syntax **syn )
+{
+	assert( syn != NULL );
+
+#if 0	/* pedantic check: don't use this */
+	{
+		Syntax *tmp = NULL;
+
+		LDAP_STAILQ_FOREACH(tmp,&syn_list,ssyn_next) {
+			if ( tmp == *syn ) {
+				break;
+			}
+		}
+
+		assert( tmp != NULL );
+	}
+#endif
+
+	*syn = LDAP_STAILQ_NEXT(*syn,ssyn_next);
+
+	return (*syn != NULL);
+}
+
+void
+syn_unparse( BerVarray *res, Syntax *start, Syntax *end, int sys )
+{
+	Syntax *syn;
+	int i, num;
+	struct berval bv, *bva = NULL, idx;
+	char ibuf[32];
+
+	if ( !start )
+		start = LDAP_STAILQ_FIRST( &syn_list );
+
+	/* count the result size */
+	i = 0;
+	for ( syn = start; syn; syn = LDAP_STAILQ_NEXT( syn, ssyn_next ) ) {
+		if ( sys && !( syn->ssyn_flags & SLAP_SYNTAX_HARDCODE ) ) break;
+		i++;
+		if ( syn == end ) break;
+	}
+	if ( !i ) return;
+
+	num = i;
+	bva = ch_malloc( (num+1) * sizeof(struct berval) );
+	BER_BVZERO( bva );
+	idx.bv_val = ibuf;
+	if ( sys ) {
+		idx.bv_len = 0;
+		ibuf[0] = '\0';
+	}
+	i = 0;
+	for ( syn = start; syn; syn = LDAP_STAILQ_NEXT( syn, ssyn_next ) ) {
+		if ( sys && !( syn->ssyn_flags & SLAP_SYNTAX_HARDCODE ) ) break;
+		if ( ldap_syntax2bv( &syn->ssyn_syn, &bv ) == NULL ) {
+			ber_bvarray_free( bva );
+		}
+		if ( !sys ) {
+			idx.bv_len = sprintf(idx.bv_val, "{%d}", i);
+		}
+		bva[i].bv_len = idx.bv_len + bv.bv_len;
+		bva[i].bv_val = ch_malloc( bva[i].bv_len + 1 );
+		strcpy( bva[i].bv_val, ibuf );
+		strcpy( bva[i].bv_val + idx.bv_len, bv.bv_val );
+		i++;
+		bva[i].bv_val = NULL;
+		ldap_memfree( bv.bv_val );
+		if ( syn == end ) break;
+	}
+	*res = bva;
+}
+