more attr_merge cleanup (please check)

[openldap] / servers / slapd / back-dnssrv / search.c

diff --git a/servers/slapd/back-dnssrv/search.c b/servers/slapd/back-dnssrv/search.c
index 2e0f14fca4b2c0ff7196247e0f9cda5cc730c0e4..fa4917867319bb3b190a76c1c452af7746031bbc 100644 (file)
--- a/servers/slapd/back-dnssrv/search.c
+++ b/servers/slapd/back-dnssrv/search.c
@@ -179,8 +179,8 @@ dnssrv_back_search(
                e.e_attrs = NULL;
                e.e_private = NULL;
 
-               attr_mergeit_one( &e, ad_objectClass, &slap_schema.si_oc_referral->soc_cname );
-               attr_mergeit_one( &e, ad_objectClass, &slap_schema.si_oc_extensibleObject->soc_cname );
+               attr_merge_one( &e, ad_objectClass, &slap_schema.si_oc_referral->soc_cname, NULL );
+               attr_merge_one( &e, ad_objectClass, &slap_schema.si_oc_extensibleObject->soc_cname, NULL );
 
                if ( ad_dc ) {
                        char            *p;
@@ -200,17 +200,17 @@ dnssrv_back_search(
                                bv.bv_len = strlen( bv.bv_val );
                        }
 
-                       attr_mergeit_one( &e, ad_dc, &bv );
+                       attr_merge_normalize_one( &e, ad_dc, &bv, NULL );
                }
 
                if ( ad_associatedDomain ) {
                        struct berval   bv;
 
                        ber_str2bv( domain, 0, 0, &bv );
-                       attr_mergeit_one( &e, ad_associatedDomain, &bv );
+                       attr_merge_normalize_one( &e, ad_associatedDomain, &bv, NULL );
                }
 
-               attr_mergeit( &e, ad_ref, urls );
+               attr_merge_normalize_one( &e, ad_ref, urls, NULL );
 
                rc = test_filter( op, &e, op->oq_search.rs_filter );