From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 1 Mar 2003 15:41:54 +0000 (+0000)
Subject: fix attr_merge_one hack
X-Git-Tag: NO_SLAP_OP_BLOCKS~228
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9702e837e82bfc15116e241bcf464c9f3841a8be;p=openldap

fix attr_merge_one hack
---

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 258b13a3da..9396fa5e67 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -150,7 +150,7 @@ LDAP_SLAPD_F (int) attr_merge_one LDAP_P(( Entry *e,
 	struct berval *nval ));
 #else
 #define attr_mergeit( e, d, v ) attr_merge( e, d, v )
-#define attr_mergeit_one( e, d, v ) attr_merge( e, d, v )
+#define attr_mergeit_one( e, d, v ) attr_merge_one( e, d, v )
 LDAP_SLAPD_F (int) attr_merge LDAP_P(( Entry *e,
 	AttributeDescription *desc,
 	BerVarray vals ));