Use #ifdef, not #if

[openldap] / servers / slapd / syntax.c

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index e26fe835c53d529993172aab8fc1da936444bdca..e46db6e33c12d7ec00ad159487ea7c7dfac6c166 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-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -102,10 +102,14 @@ syn_insert(
 int
 syn_add(
     LDAP_SYNTAX                *syn,
-       int flags,
+       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,20 +117,29 @@ syn_add(
        int             code;
 
        ssyn = (Syntax *) ch_calloc( 1, sizeof(Syntax) );
-       memcpy( &ssyn->ssyn_syn, syn, sizeof(LDAP_SYNTAX));
+
+       memcpy( &ssyn->ssyn_syn, syn, sizeof(LDAP_SYNTAX) );
+
+       ssyn->ssyn_next = NULL;
 
        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,
+       char * desc,
+       unsigned flags,
        slap_syntax_validate_func *validate,
        slap_syntax_transform_func *ber2str,
        slap_syntax_transform_func *str2ber )
@@ -135,7 +148,7 @@ register_syntax(
        int             code;
        const char      *err;
 
-       syn = ldap_str2syntax( desc, &code, &err);
+       syn = ldap_str2syntax( desc, &code, &err, LDAP_SCHEMA_ALLOW_ALL);
        if ( !syn ) {
                Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s before %s in %s\n",
                    ldap_scherr2str(code), err, desc );
@@ -161,20 +174,27 @@ syn_schema_info( Entry *e )
        struct berval   *vals[2];
        Syntax          *syn;
 
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+       AttributeDescription *ad_ldapSyntaxes = slap_schema.si_ad_ldapSyntaxes;
+#else
+       char *ad_ldapSyntaxes = "ldapSyntaxes";
+#endif
+
        vals[0] = &val;
        vals[1] = 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 ( val.bv_val == NULL ) {
                        return -1;
                }
+               val.bv_len = strlen( val.bv_val );
+#if 0
+               Debug( LDAP_DEBUG_TRACE, "Merging syn [%ld] %s\n",
+              (long) val.bv_len, val.bv_val, 0 );
+#endif
+               attr_merge( e, ad_ldapSyntaxes, vals );
+               ldap_memfree( val.bv_val );
        }
        return 0;
 }