X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsyntax.c;h=2c1bc91f6d07ac334e206f21ead440c29ac557da;hb=8975676fa435f4178c62e4d213697906ff81059f;hp=02ce073d2a500c9815863e9c5c3b6d61f482eb55;hpb=f52cc9bab51e427afa3ed5d28be012d8da27a7a8;p=openldap

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index 02ce073d2a..2c1bc91f6d 100644
--- 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
  */
 
@@ -16,7 +16,6 @@
 #include "slap.h"
 #include "ldap_pvt.h"
 
-
 struct sindexrec {
 	char		*sir_name;
 	Syntax		*sir_syn;
@@ -103,7 +102,7 @@ syn_insert(
 				 (AVL_DUP) avl_dup_error ) ) {
 			*err = ssyn->ssyn_oid;
 			ldap_memfree(sir);
-			return SLAP_SCHERR_DUP_SYNTAX;
+			return SLAP_SCHERR_SYN_DUP;
 		}
 		/* FIX: temporal consistency check */
 		syn_find(sir->sir_name);
@@ -114,14 +113,7 @@ syn_insert(
 int
 syn_add(
     LDAPSyntax		*syn,
-	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
+    slap_syntax_defs_rec *def,
     const char		**err
 )
 {
@@ -134,15 +126,20 @@ syn_add(
 
 	ssyn->ssyn_next = NULL;
 
+	/*
+	 * note: ssyn_bvoid uses the same memory of ssyn_syn.syn_oid;
+	 * ssyn_oidlen is #defined as ssyn_bvoid.bv_len
+	 */
+	ssyn->ssyn_bvoid.bv_val = ssyn->ssyn_syn.syn_oid;
 	ssyn->ssyn_oidlen = strlen(syn->syn_oid);
-	ssyn->ssyn_flags = flags;
-	ssyn->ssyn_validate = validate;
-	ssyn->ssyn_normalize = normalize;
-	ssyn->ssyn_pretty = pretty;
+	ssyn->ssyn_flags = def->sd_flags;
+	ssyn->ssyn_validate = def->sd_validate;
+	ssyn->ssyn_normalize = def->sd_normalize;
+	ssyn->ssyn_pretty = def->sd_pretty;
 
 #ifdef SLAPD_BINARY_CONVERSION
-	ssyn->ssyn_ber2str = ber2str;
-	ssyn->ssyn_str2ber = str2ber;
+	ssyn->ssyn_ber2str = def->sd_ber2str;
+	ssyn->ssyn_str2ber = def->sd_str2ber;
 #endif
 
 	code = syn_insert(ssyn, err);
@@ -151,42 +148,38 @@ syn_add(
 
 int
 register_syntax(
-	const char * desc,
-	unsigned flags,
-	slap_syntax_validate_func *validate,
-	slap_syntax_transform_func *normalize,
-	slap_syntax_transform_func *pretty )
+	slap_syntax_defs_rec *def )
 {
 	LDAPSyntax	*syn;
 	int		code;
 	const char	*err;
 
-	syn = ldap_str2syntax( desc, &code, &err, LDAP_SCHEMA_ALLOW_ALL);
+	syn = ldap_str2syntax( def->sd_desc, &code, &err, LDAP_SCHEMA_ALLOW_ALL);
 	if ( !syn ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "schema", LDAP_LEVEL_ERR,
-			   "register_syntax: Error - %s before %s in %s.\n",
-			   ldap_scherr2str(code), err, desc ));
+		LDAP_LOG( CONFIG, ERR, 
+			"register_syntax: Error - %s before %s in %s.\n",
+			ldap_scherr2str(code), err, def->sd_desc );
 #else
 		Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s before %s in %s\n",
-		    ldap_scherr2str(code), err, desc );
+		    ldap_scherr2str(code), err, def->sd_desc );
 #endif
 
 		return( -1 );
 	}
 
-	code = syn_add( syn, flags, validate, normalize, pretty, &err );
+	code = syn_add( syn, def, &err );
 
 	ldap_memfree( syn );
 
 	if ( code ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "schema", LDAP_LEVEL_ERR,
-			   "register_syntax: Error - %s %s in %s\n",
-			   scherr2str(code), err, desc ));
+		LDAP_LOG( CONFIG, ERR, 
+			"register_syntax: Error - %s %s in %s\n", 
+			scherr2str(code), err, def->sd_desc );
 #else
 		Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s %s in %s\n",
-		    scherr2str(code), err, desc );
+		    scherr2str(code), err, def->sd_desc );
 #endif
 
 		return( -1 );
@@ -195,8 +188,6 @@ register_syntax(
 	return( 0 );
 }
 
-#if defined( SLAPD_SCHEMA_DN )
-
 int
 syn_schema_info( Entry *e )
 {
@@ -222,9 +213,9 @@ syn_schema_info( Entry *e )
 		}
 #if 0
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+		LDAP_LOG( config, ENTRY,
 			   "syn_schema_info: Merging syn [%ld] %s\n",
-			   (long)vals[0].bv_len, vals[0].bv_val ));
+			   (long)vals[0].bv_len, vals[0].bv_val, 0 );
 #else
 		Debug( LDAP_DEBUG_TRACE, "Merging syn [%ld] %s\n",
 	       (long) vals[0].bv_len, vals[0].bv_val, 0 );
@@ -237,4 +228,3 @@ syn_schema_info( Entry *e )
 	return 0;
 }
 
-#endif