X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsyntax.c;h=02ce073d2a500c9815863e9c5c3b6d61f482eb55;hb=4aa2a2869219880c9a76d9c0ae163a7ff7a51d4e;hp=e2207c8dc0cb9ac8af65aed35c2ab860b7b73a54;hpb=ffcdc6d11d7e86260be64e47229ca75bc7b7ac20;p=openldap

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index e2207c8dc0..02ce073d2a 100644
--- a/servers/slapd/syntax.c
+++ b/servers/slapd/syntax.c
@@ -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,
@@ -122,6 +134,7 @@ syn_add(
 
 	ssyn->ssyn_next = NULL;
 
+	ssyn->ssyn_oidlen = strlen(syn->syn_oid);
 	ssyn->ssyn_flags = flags;
 	ssyn->ssyn_validate = validate;
 	ssyn->ssyn_normalize = normalize;
@@ -138,7 +151,7 @@ syn_add(
 
 int
 register_syntax(
-	char * desc,
+	const char * desc,
 	unsigned flags,
 	slap_syntax_validate_func *validate,
 	slap_syntax_transform_func *normalize,
@@ -151,9 +164,9 @@ register_syntax(
 	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 ));
+		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 );
@@ -168,9 +181,9 @@ register_syntax(
 
 	if ( code ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "schema", LDAP_LEVEL_ERR,
-                       "register_syntax: Error - %s %s in %s\n",
-                       scherr2str(code), err, desc ));
+		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 );
@@ -187,14 +200,12 @@ register_syntax(
 int
 syn_schema_info( Entry *e )
 {
-	struct berval	val;
-	struct berval	*vals[2];
+	struct berval	vals[2];
 	Syntax		*syn;
 
 	AttributeDescription *ad_ldapSyntaxes = slap_schema.si_ad_ldapSyntaxes;
 
-	vals[0] = &val;
-	vals[1] = NULL;
+	vals[1].bv_val = NULL;
 
 	for ( syn = syn_list; syn; syn = syn->ssyn_next ) {
 		if ( ! syn->ssyn_validate ) {
@@ -206,24 +217,22 @@ syn_schema_info( Entry *e )
 			continue;
 		}
 
-		val.bv_val = ldap_syntax2str( &syn->ssyn_syn );
-		if ( val.bv_val == NULL ) {
+		if ( ldap_syntax2bv( &syn->ssyn_syn, vals ) == NULL ) {
 			return -1;
 		}
-		val.bv_len = strlen( val.bv_val );
 #if 0
 #ifdef NEW_LOGGING
-                LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
-                           "syn_schema_info: Merging syn [%ld] %s\n",
-                           (long)val.bv_len, val.bv_val ));
+		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) val.bv_len, val.bv_val, 0 );
+	       (long) vals[0].bv_len, vals[0].bv_val, 0 );
 #endif
 
 #endif
 		attr_merge( e, ad_ldapSyntaxes, vals );
-		ldap_memfree( val.bv_val );
+		ldap_memfree( vals[0].bv_val );
 	}
 	return 0;
 }