Don't use 'shtool mkln' as ln(1) replacement.

[openldap] / servers / slapd / syntax.c

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index b1332ff90471ed24f7d580b1c866ad663a3bc0bc..2155eb20f5b1c438893ad6933c33a89c208e1a08 100644 (file)
--- 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
 )
 {
@@ -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,
@@ -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 ));
+                          (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;
 }