Merge remote-tracking branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-dnssrv/search.c b/servers/slapd/back-dnssrv/search.c
index 8bf56f5855b91c5106d8839c821f0d5ef026c5f6..a9b1751cabe984fb1e79204f42296a929f7ce9bc 100644 (file)
--- a/servers/slapd/back-dnssrv/search.c
+++ b/servers/slapd/back-dnssrv/search.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2005 The OpenLDAP Foundation.
+ * Copyright 2000-2012 The OpenLDAP Foundation.
  * Portions Copyright 2000-2003 Kurt D. Zeilenga.
  * All rights reserved.
  *
@@ -48,21 +48,17 @@ dnssrv_back_search(
        rs->sr_ref = NULL;
 
        if ( BER_BVISEMPTY( &op->o_req_ndn ) ) {
-#ifdef LDAP_DEVEL
-#if 0
                /* FIXME: need some means to determine whether the database
                 * is a glue instance; if we got here with empty DN, then
                 * we passed this same test in dnssrv_back_referrals() */
                if ( !SLAP_GLUE_INSTANCE( op->o_bd ) ) {
                        rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
-                       rs->sr_err = "DNS SRV operation upon null (empty) DN disallowed";
-               } else
-#endif
-               {
+                       rs->sr_text = "DNS SRV operation upon null (empty) DN disallowed";
+
+               } else {
                        rs->sr_err = LDAP_SUCCESS;
                }
                goto done;
-#endif /* LDAP_DEVEL */
        }
 
        manageDSAit = get_manageDSAit( op );
@@ -106,11 +102,11 @@ dnssrv_back_search(
        for( i=0; hosts[i] != NULL; i++) {
                struct berval url;
 
-               url.bv_len = sizeof("ldap://")-1 + strlen(hosts[i]);
+               url.bv_len = STRLENOF( "ldap://" ) + strlen(hosts[i]);
                url.bv_val = ch_malloc( url.bv_len + 1 );
 
                strcpy( url.bv_val, "ldap://" );
-               strcpy( &url.bv_val[sizeof("ldap://")-1], hosts[i] );
+               strcpy( &url.bv_val[STRLENOF( "ldap://" )], hosts[i] );
 
                if( ber_bvarray_add( &urls, &url ) < 0 ) {
                        free( url.bv_val );
@@ -169,67 +165,64 @@ dnssrv_back_search(
                send_ldap_error( op, rs, LDAP_SUCCESS, NULL );
 
        } else {
-               struct berval   vals[2];
-               Entry *e = ch_calloc( 1, sizeof(Entry) );
+               Entry e = { 0 };
                AttributeDescription *ad_objectClass
                        = slap_schema.si_ad_objectClass;
                AttributeDescription *ad_ref = slap_schema.si_ad_ref;
-               e->e_name.bv_val = strdup( op->o_req_dn.bv_val );
-               e->e_name.bv_len = op->o_req_dn.bv_len;
-               e->e_nname.bv_val = strdup( op->o_req_ndn.bv_val );
-               e->e_nname.bv_len = op->o_req_ndn.bv_len;
-
-               e->e_attrs = NULL;
-               e->e_private = NULL;
-
-               vals[1].bv_val = NULL;
-
-               BER_BVSTR( &vals[0], "top" );
-               attr_mergeit( e, ad_objectClass, &slap_schema.si_oc_top->soc_cname );
+               e.e_name.bv_val = ch_strdup( op->o_req_dn.bv_val );
+               e.e_name.bv_len = op->o_req_dn.bv_len;
+               e.e_nname.bv_val = ch_strdup( op->o_req_ndn.bv_val );
+               e.e_nname.bv_len = op->o_req_ndn.bv_len;
 
-               BER_BVSTR( &vals[0], "referral" );
-               attr_mergeit( e, ad_objectClass, &slap_schema.si_oc_referral->soc_cname );
+               e.e_attrs = NULL;
+               e.e_private = NULL;
 
-               BER_BVSTR( &vals[0], "extensibleObject" );
-               attr_mergeit( 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;
-                       vals[0].bv_val = ch_strdup( domain );
+                       char            *p;
+                       struct berval   bv;
 
-                       p = strchr( vals[0].bv_val, '.' );
+                       bv.bv_val = domain;
+
+                       p = strchr( bv.bv_val, '.' );
                                        
-                       if ( p == vals[0].bv_val ) {
-                               vals[0].bv_val[1] = '\0';
+                       if ( p == bv.bv_val ) {
+                               bv.bv_len = 1;
 
                        } else if ( p != NULL ) {
-                               *p = '\0';
+                               bv.bv_len = p - bv.bv_val;
+
+                       } else {
+                               bv.bv_len = strlen( bv.bv_val );
                        }
 
-                       vals[0].bv_len = strlen( vals[0].bv_val );
-                       attr_mergeit( e, ad_dc, vals );
+                       attr_merge_normalize_one( &e, ad_dc, &bv, NULL );
                }
 
                if ( ad_associatedDomain ) {
-                       vals[0].bv_val = domain;
-                       vals[0].bv_len = strlen(domain);
-                       attr_mergeit( e, ad_associatedDomain, vals );
+                       struct berval   bv;
+
+                       ber_str2bv( domain, 0, 0, &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 ); 
+               rc = test_filter( op, &e, op->oq_search.rs_filter ); 
 
                if( rc == LDAP_COMPARE_TRUE ) {
-                       rs->sr_entry = e;
+                       rs->sr_entry = &e;
                        rs->sr_attrs = op->oq_search.rs_attrs;
                        rs->sr_flags = REP_ENTRY_MODIFIABLE;
                        send_search_entry( op, rs );
                        rs->sr_entry = NULL;
                        rs->sr_attrs = NULL;
+                       rs->sr_flags = 0;
                }
 
-               entry_free( e );
+               entry_clean( &e );
 
                rs->sr_err = LDAP_SUCCESS;
                send_ldap_result( op, rs );
@@ -245,4 +238,3 @@ done:
        if( urls != NULL ) ber_bvarray_free( urls );
        return 0;
 }
-