X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fattr.c;h=2a6b5f180e6a5b8bec29205d293cb2908fac3fda;hb=3d522a0c9fd79b0275a219bde1f4465b181a9318;hp=f46be1f472e21eaabe485e47bca459f61ac7da3e;hpb=bf438cda3ec74b36b480a940cca7713eff59abe0;p=openldap

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index f46be1f472..2a6b5f180e 100644
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -1,9 +1,28 @@
+/* attr.c - routines for dealing with attributes */
 /* $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-2003 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>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
-/* attr.c - routines for dealing with attributes */
 
 #include "portable.h"
 
@@ -162,15 +181,17 @@ attr_merge_normalize(
 	BerVarray	nvals = NULL;
 	int		rc;
 
-	if ( desc->ad_type->sat_equality && desc->ad_type->sat_equality->smr_normalize ) {
+	if ( desc->ad_type->sat_equality &&
+		desc->ad_type->sat_equality->smr_normalize )
+	{
 		int	i;
 		
 		for ( i = 0; vals[i].bv_val; i++ );
 
-		nvals = ch_calloc( sizeof(struct berval), i + 1 );
+		nvals = sl_calloc( sizeof(struct berval), i + 1, memctx );
 		for ( i = 0; vals[i].bv_val; i++ ) {
 			rc = (*desc->ad_type->sat_equality->smr_normalize)(
-					0,
+					SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
 					desc->ad_type->sat_syntax,
 					desc->ad_type->sat_equality,
 					&vals[i], &nvals[i], memctx );
@@ -187,7 +208,7 @@ attr_merge_normalize(
 
 error_return:;
 	if ( nvals != NULL ) {
-		ber_bvarray_free( nvals );
+		ber_bvarray_free_x( nvals, memctx );
 	}
 	return rc;
 }
@@ -235,9 +256,11 @@ attr_merge_normalize_one(
 	struct berval	*nvalp;
 	int		rc;
 
-	if ( desc->ad_type->sat_equality && desc->ad_type->sat_equality->smr_normalize ) {
+	if ( desc->ad_type->sat_equality &&
+		desc->ad_type->sat_equality->smr_normalize )
+	{
 		rc = (*desc->ad_type->sat_equality->smr_normalize)(
-				0,
+				SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
 				desc->ad_type->sat_syntax,
 				desc->ad_type->sat_equality,
 				val, &nval, memctx );
@@ -252,7 +275,7 @@ attr_merge_normalize_one(
 
 	rc = attr_merge_one( e, desc, val, nvalp );
 	if ( nvalp != NULL ) {
-		ch_free( nval.bv_val );
+		sl_free( nval.bv_val, memctx );
 	}
 	return rc;
 }