More system schema checks

[openldap] / servers / slapd / syntax.c

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index 78bddd3276f7e6e8f2a83cda1de046f21bd458f4..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
  */
 
@@ -134,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;
@@ -199,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 ) {
@@ -218,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;
 }