Commit of the Proxy Cache contribution (ITS#2062)

[openldap] / servers / slapd / proto-slap.h

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 258b13a3da3ea65a1c00791ab554d13bcb88ebbf..9396fa5e678a83494194cdbca3b6a274c6c6eaac 100644 (file)
--- 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 ));