X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsyntax.c;h=0469e308cb9b2a64de156106d7b837252021e6ca;hb=ae3f784d5b8b022fc8bb5ecd2e612d9b1cdd13ed;hp=28e0a18731a3af92537c5fba6c518883c1dac3d2;hpb=8502301b006e170acbc4ae9ee7aa6871f9fc79f4;p=openldap

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index 28e0a18731..0469e308cb 100644
--- a/servers/slapd/syntax.c
+++ b/servers/slapd/syntax.c
@@ -1,8 +1,17 @@
 /* syntax.c - routines to manage syntax definitions */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -14,7 +23,6 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "ldap_pvt.h"
 
 struct sindexrec {
 	char		*sir_name;
@@ -89,18 +97,14 @@ syn_insert(
 {
 	struct sindexrec	*sir;
 
+	LDAP_SLIST_NEXT( ssyn, ssyn_next ) = NULL;
 	LDAP_SLIST_INSERT_HEAD( &syn_list, ssyn, ssyn_next );
  
 	if ( ssyn->ssyn_oid ) {
 		sir = (struct sindexrec *)
 			SLAP_CALLOC( 1, sizeof(struct sindexrec) );
 		if( sir == NULL ) {
-#ifdef NEW_LOGGING
-			LDAP_LOG( OPERATION, ERR, 
-				"syn_insert: SLAP_CALLOC Error\n", 0, 0, 0 );
-#else
 			Debug( LDAP_DEBUG_ANY, "SLAP_CALLOC Error\n", 0, 0, 0 );
-#endif
 			return LDAP_OTHER;
 		}
 		sir->sir_name = ssyn->ssyn_oid;
@@ -129,12 +133,7 @@ syn_add(
 
 	ssyn = (Syntax *) SLAP_CALLOC( 1, sizeof(Syntax) );
 	if( ssyn == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, ERR, 
-			"syn_add: SLAP_CALLOC Error\n", 0, 0, 0 );
-#else
 		Debug( LDAP_DEBUG_ANY, "SLAP_CALLOC Error\n", 0, 0, 0 );
-#endif
 		return LDAP_OTHER;
 	}
 
@@ -150,7 +149,6 @@ syn_add(
 	ssyn->ssyn_oidlen = strlen(syn->syn_oid);
 	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
@@ -172,14 +170,8 @@ register_syntax(
 
 	syn = ldap_str2syntax( def->sd_desc, &code, &err, LDAP_SCHEMA_ALLOW_ALL);
 	if ( !syn ) {
-#ifdef NEW_LOGGING
-		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, def->sd_desc );
-#endif
 
 		return( -1 );
 	}
@@ -189,14 +181,8 @@ register_syntax(
 	ldap_memfree( syn );
 
 	if ( code ) {
-#ifdef NEW_LOGGING
-		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, def->sd_desc );
-#endif
 
 		return( -1 );
 	}
@@ -207,12 +193,10 @@ register_syntax(
 int
 syn_schema_info( Entry *e )
 {
-	struct berval	vals[2];
-	Syntax		*syn;
-
 	AttributeDescription *ad_ldapSyntaxes = slap_schema.si_ad_ldapSyntaxes;
-
-	vals[1].bv_val = NULL;
+	Syntax		*syn;
+	struct berval	val;
+	struct berval	nval;
 
 	LDAP_SLIST_FOREACH(syn, &syn_list, ssyn_next ) {
 		if ( ! syn->ssyn_validate ) {
@@ -224,29 +208,22 @@ syn_schema_info( Entry *e )
 			continue;
 		}
 
-		if ( ldap_syntax2bv( &syn->ssyn_syn, vals ) == NULL ) {
+		if ( ldap_syntax2bv( &syn->ssyn_syn, &val ) == NULL ) {
 			return -1;
 		}
 #if 0
-#ifdef NEW_LOGGING
-		LDAP_LOG( config, ENTRY,
-			   "syn_schema_info: Merging syn [%ld] %s\n",
-			   (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 );
+	       (long) val.bv_len, val.bv_val, 0 );
 #endif
 
-#endif
-#ifdef SLAP_NVALUES
-		if( attr_merge( e, ad_ldapSyntaxes, vals, NULL /* FIXME */ ) )
-#else
-		if( attr_merge( e, ad_ldapSyntaxes, vals ) )
-#endif
+		nval.bv_val = syn->ssyn_oid;
+		nval.bv_len = strlen(syn->ssyn_oid);
+
+		if( attr_merge_one( e, ad_ldapSyntaxes, &val, &nval ) )
 		{
 			return -1;
 		}
-		ldap_memfree( vals[0].bv_val );
+		ldap_memfree( val.bv_val );
 	}
 	return 0;
 }