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
)
{
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 )
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 );
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 );
}