From f32e8ee7e77f6df330ec028adeb29a9a3f8d60a3 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Wed, 26 Feb 2003 15:59:36 +0000 Subject: [PATCH] blind fix (accrding to back-monitor hack) --- servers/slapd/back-dnssrv/search.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/servers/slapd/back-dnssrv/search.c b/servers/slapd/back-dnssrv/search.c index 51320acbbd..88f3a0baab 100644 --- a/servers/slapd/back-dnssrv/search.c +++ b/servers/slapd/back-dnssrv/search.c @@ -156,15 +156,15 @@ dnssrv_back_search( vals[0].bv_val = "top"; vals[0].bv_len = sizeof("top")-1; - attr_merge( e, ad_objectClass, vals ); + attr_mergeit( e, ad_objectClass, vals ); vals[0].bv_val = "referral"; vals[0].bv_len = sizeof("referral")-1; - attr_merge( e, ad_objectClass, vals ); + attr_mergeit( e, ad_objectClass, vals ); vals[0].bv_val = "extensibleObject"; vals[0].bv_len = sizeof("extensibleObject")-1; - attr_merge( e, ad_objectClass, vals ); + attr_mergeit( e, ad_objectClass, vals ); { AttributeDescription *ad = NULL; @@ -185,7 +185,7 @@ dnssrv_back_search( } vals[0].bv_len = strlen(vals[0].bv_val); - attr_merge( e, ad, vals ); + attr_mergeit( e, ad, vals ); } } @@ -198,11 +198,11 @@ dnssrv_back_search( if( rc == LDAP_SUCCESS ) { vals[0].bv_val = domain; vals[0].bv_len = strlen(domain); - attr_merge( e, ad, vals ); + attr_mergeit( e, ad, vals ); } } - attr_merge( e, ad_ref, urls ); + attr_mergeit( e, ad_ref, urls ); rc = test_filter( be, conn, op, e, filter ); -- 2.39.5