add new ber dump routine (behind NEW_LOGGING)

[openldap] / servers / slapd / syntax.c

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index 52521da78f176e3bbad81f75a6db4bf4acced98a..6fd2a73e3b532022cf77296c300fece47892010d 100644 (file)
--- a/servers/slapd/syntax.c
+++ b/servers/slapd/syntax.c
@@ -101,7 +101,7 @@ syn_insert(
 
 int
 syn_add(
-    LDAP_SYNTAX                *syn,
+    LDAPSyntax         *syn,
        unsigned flags,
     slap_syntax_validate_func  *validate,
     slap_syntax_transform_func *normalize,
@@ -118,7 +118,7 @@ syn_add(
 
        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;
 
@@ -141,10 +141,10 @@ register_syntax(
        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;
 
@@ -155,7 +155,10 @@ register_syntax(
                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 ) {
                Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s %s in %s\n",
                    scherr2str(code), err, desc );
@@ -180,6 +183,15 @@ syn_schema_info( Entry *e )
        vals[1] = NULL;
 
        for ( syn = syn_list; syn; syn = syn->ssyn_next ) {
+               if ( ! syn->ssyn_validate ) {
+                       /* skip syntaxes without validators */
+                       continue;
+               }
+               if ( syn->ssyn_flags & SLAP_SYNTAX_HIDE ) {
+                       /* hide syntaxes */
+                       continue;
+               }
+
                val.bv_val = ldap_syntax2str( &syn->ssyn_syn );
                if ( val.bv_val == NULL ) {
                        return -1;