X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fattr.c;h=ab9c56511ed0052bc06f44e07aa350d29230f32a;hb=104f8cc409822fcdf5aa98ae14f738d869e00eb5;hp=179cc3d6d5ee4667c99d31f2626d6d313c97db30;hpb=ac1332cdb868b6a30f545796aca8e0bbf13fe939;p=openldap

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 179cc3d6d5..ab9c56511e 100644
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -23,7 +23,9 @@
 #include "slap.h"
 
 #ifdef LDAP_DEBUG
-static void at_index_print( void ) {};
+static void at_index_print( void ) 
+{
+}
 #endif
 
 void
@@ -115,8 +117,7 @@ attr_merge(
 	Attribute	**a;
 
 	for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) {
-		if ( ad_cmp( (*a)->a_desc, desc ) == 0 )
-		{
+		if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
 			break;
 		}
 	}
@@ -132,6 +133,31 @@ attr_merge(
 	return( value_add( &(*a)->a_vals, vals ) );
 }
 
+int
+attr_merge_one(
+	Entry		*e,
+	AttributeDescription *desc,
+	struct berval	*val )
+{
+	Attribute	**a;
+
+	for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) {
+		if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
+			break;
+		}
+	}
+
+	if ( *a == NULL ) {
+		*a = (Attribute *) ch_malloc( sizeof(Attribute) );
+		(*a)->a_desc = desc;
+		(*a)->a_vals = NULL;
+		(*a)->a_next = NULL;
+		(*a)->a_flags = 0;
+	}
+
+	return( value_add_one( &(*a)->a_vals, val ) );
+}
+
 /*
  * attrs_find - find attribute(s) by AttributeDescription
  * returns next attribute which is subtype of provided description.
@@ -163,8 +189,7 @@ attr_find(
 )
 {
 	for ( ; a != NULL; a = a->a_next ) {
-		if ( ad_cmp( a->a_desc, desc ) == 0 )
-		{
+		if ( ad_cmp( a->a_desc, desc ) == 0 ) {
 			return( a );
 		}
 	}
@@ -188,8 +213,7 @@ attr_delete(
 	Attribute	**a;
 
 	for ( a = attrs; *a != NULL; a = &(*a)->a_next ) {
-		if ( ad_cmp( (*a)->a_desc, desc ) == 0 )
-		{
+		if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
 			Attribute	*save = *a;
 			*a = (*a)->a_next;
 			attr_free( save );