X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsyntax.c;h=2155eb20f5b1c438893ad6933c33a89c208e1a08;hb=d23c55964651929e7b2b5a1730b33efee9661033;hp=cdbd656cc973592b30b350df2b2f74d73d7cf9cd;hpb=4bc786f34b50aa301be6f5600f58a980070f481e;p=openldap

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index cdbd656cc9..2155eb20f5 100644
--- a/servers/slapd/syntax.c
+++ b/servers/slapd/syntax.c
@@ -1,7 +1,7 @@
 /* syntax.c - routines to manage syntax definitions */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -36,7 +36,7 @@ syn_index_cmp(
 
 static int
 syn_index_name_cmp(
-    char 		*name,
+    const char		*name,
     struct sindexrec	*sir
 )
 {
@@ -49,7 +49,7 @@ syn_find( const char *synname )
 	struct sindexrec	*sir = NULL;
 
 	if ( (sir = (struct sindexrec *) avl_find( syn_index, synname,
-            (AVL_CMP) syn_index_name_cmp )) != NULL ) {
+	    (AVL_CMP) syn_index_name_cmp )) != NULL ) {
 		return( sir->sir_syn );
 	}
 	return( NULL );
@@ -66,6 +66,18 @@ syn_find_desc( const char *syndesc, int *len )
 	return( NULL );
 }
 
+void
+syn_destroy( void )
+{
+	Syntax *s, *n;
+
+	avl_free(syn_index, ldap_memfree);
+	for (s=syn_list; s; s=n) {
+		n = s->ssyn_next;
+		ldap_syntax_free((LDAPSyntax *)s);
+	}
+}
+
 static int
 syn_insert(
     Syntax		*ssyn,
@@ -101,11 +113,15 @@ syn_insert(
 
 int
 syn_add(
-    LDAP_SYNTAX		*syn,
-	int flags,
+    LDAPSyntax		*syn,
+	unsigned flags,
     slap_syntax_validate_func	*validate,
+    slap_syntax_transform_func	*normalize,
+    slap_syntax_transform_func	*pretty,
+#ifdef SLAPD_BINARY_CONVERSION
     slap_syntax_transform_func	*ber2str,
     slap_syntax_transform_func	*str2ber,
+#endif
     const char		**err
 )
 {
@@ -113,39 +129,66 @@ syn_add(
 	int		code;
 
 	ssyn = (Syntax *) ch_calloc( 1, sizeof(Syntax) );
-	memcpy( &ssyn->ssyn_syn, syn, sizeof(LDAP_SYNTAX));
 
+	AC_MEMCPY( &ssyn->ssyn_syn, syn, sizeof(LDAPSyntax) );
+
+	ssyn->ssyn_next = NULL;
+
+	ssyn->ssyn_oidlen = strlen(syn->syn_oid);
 	ssyn->ssyn_flags = flags;
 	ssyn->ssyn_validate = validate;
+	ssyn->ssyn_normalize = normalize;
+	ssyn->ssyn_pretty = pretty;
+
+#ifdef SLAPD_BINARY_CONVERSION
 	ssyn->ssyn_ber2str = ber2str;
 	ssyn->ssyn_str2ber = str2ber;
+#endif
 
-	code = syn_insert(ssyn,err);
+	code = syn_insert(ssyn, err);
 	return code;
 }
 
 int
 register_syntax(
-	char * desc, int flags,
+	const char * desc,
+	unsigned flags,
 	slap_syntax_validate_func *validate,
-	slap_syntax_transform_func *ber2str,
-	slap_syntax_transform_func *str2ber )
+	slap_syntax_transform_func *normalize,
+	slap_syntax_transform_func *pretty )
 {
-	LDAP_SYNTAX	*syn;
+	LDAPSyntax	*syn;
 	int		code;
 	const char	*err;
 
-	syn = ldap_str2syntax( desc, &code, &err);
+	syn = ldap_str2syntax( desc, &code, &err, LDAP_SCHEMA_ALLOW_ALL);
 	if ( !syn ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "schema", LDAP_LEVEL_ERR,
+			   "register_syntax: Error - %s before %s in %s.\n",
+			   ldap_scherr2str(code), err, desc ));
+#else
 		Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s before %s in %s\n",
 		    ldap_scherr2str(code), err, desc );
+#endif
+
 		return( -1 );
 	}
 
-	code = syn_add( syn, flags, validate, ber2str, str2ber, &err );
+	code = syn_add( syn, flags, validate, normalize, pretty, &err );
+
+	ldap_memfree( syn );
+
 	if ( code ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "schema", LDAP_LEVEL_ERR,
+			   "register_syntax: Error - %s %s in %s\n",
+			   scherr2str(code), err, desc ));
+#else
 		Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s %s in %s\n",
 		    scherr2str(code), err, desc );
+#endif
+
 		return( -1 );
 	}
 
@@ -157,24 +200,39 @@ register_syntax(
 int
 syn_schema_info( Entry *e )
 {
-	struct berval	val;
-	struct berval	*vals[2];
+	struct berval	vals[2];
 	Syntax		*syn;
 
-	vals[0] = &val;
-	vals[1] = NULL;
+	AttributeDescription *ad_ldapSyntaxes = slap_schema.si_ad_ldapSyntaxes;
+
+	vals[1].bv_val = NULL;
 
 	for ( syn = syn_list; syn; syn = syn->ssyn_next ) {
-		val.bv_val = ldap_syntax2str( &syn->ssyn_syn );
-		if ( val.bv_val ) {
-			val.bv_len = strlen( val.bv_val );
-			Debug( LDAP_DEBUG_TRACE, "Merging syn [%ld] %s\n",
-			       (long) val.bv_len, val.bv_val, 0 );
-			attr_merge( e, "ldapSyntaxes", vals );
-			ldap_memfree( val.bv_val );
-		} else {
+		if ( ! syn->ssyn_validate ) {
+			/* skip syntaxes without validators */
+			continue;
+		}
+		if ( syn->ssyn_flags & SLAP_SYNTAX_HIDE ) {
+			/* hide syntaxes */
+			continue;
+		}
+
+		if ( ldap_syntax2bv( &syn->ssyn_syn, vals ) == NULL ) {
 			return -1;
 		}
+#if 0
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+			   "syn_schema_info: Merging syn [%ld] %s\n",
+			   (long)vals[0].bv_len, vals[0].bv_val ));
+#else
+		Debug( LDAP_DEBUG_TRACE, "Merging syn [%ld] %s\n",
+	       (long) vals[0].bv_len, vals[0].bv_val, 0 );
+#endif
+
+#endif
+		attr_merge( e, ad_ldapSyntaxes, vals );
+		ldap_memfree( vals[0].bv_val );
 	}
 	return 0;
 }