]> git.sur5r.net Git - openldap/commitdiff
blind fix (accrding to back-monitor hack)
authorPierangelo Masarati <ando@openldap.org>
Wed, 26 Feb 2003 15:59:36 +0000 (15:59 +0000)
committerPierangelo Masarati <ando@openldap.org>
Wed, 26 Feb 2003 15:59:36 +0000 (15:59 +0000)
servers/slapd/back-dnssrv/search.c

index 51320acbbd4fae6db5dbda568ddfc0e4c47507ca..88f3a0baab302c5a05eb335bf93224d8ff8543e9 100644 (file)
@@ -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 );