Fix access_allowed() error checking bug

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

diff --git a/servers/slapd/back-dnssrv/search.c b/servers/slapd/back-dnssrv/search.c
index 9e8ac2496aef23264736ab3223fa5dedaddbae19..2a831bb8f9d1bdcf883876b32fa9950315c74b40 100644 (file)
--- a/servers/slapd/back-dnssrv/search.c
+++ b/servers/slapd/back-dnssrv/search.c
@@ -1,7 +1,7 @@
 /* search.c - DNS SRV backend search function */
 /* $OpenLDAP$ */
 /*
- * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -29,7 +29,7 @@ dnssrv_back_search(
     int                size,
     int                time,
     Filter     *filter,
-    const char *filterstr,
+    struct berval      *filterstr,
     AttributeName      *attrs,
     int                attrsonly )
 {
@@ -40,22 +40,20 @@ dnssrv_back_search(
        char **hosts = NULL;
        char *refdn;
        struct berval nrefdn = { 0, NULL };
-       struct berval **urls = NULL;
+       BerVarray urls = NULL;
 
        assert( get_manageDSAit( op ) );
 
-       if( ldap_dn2domain( dn->bv_val, &domain ) ) {
+       if( ldap_dn2domain( dn->bv_val, &domain ) || domain == NULL ) {
                send_ldap_result( conn, op, LDAP_REFERRAL,
                        NULL, NULL, default_referral, NULL );
                goto done;
        }
 
        Debug( LDAP_DEBUG_TRACE, "DNSSRV: dn=\"%s\" -> domain=\"%s\"\n",
-               dn->bv_len ? dn->bv_val : "",
-               domain == NULL ? "" : domain,
-               0 );
+               dn->bv_len ? dn->bv_val : "", domain, 0 );
 
-       if( rc = ldap_domain2hostlist( domain, &hostlist ) ) {
+       if( ( rc = ldap_domain2hostlist( domain, &hostlist ) ) ) {
                Debug( LDAP_DEBUG_TRACE, "DNSSRV: domain2hostlist returned %d\n",
                        rc, 0, 0 );
                send_ldap_result( conn, op, LDAP_NO_SUCH_OBJECT,
@@ -63,7 +61,7 @@ dnssrv_back_search(
                goto done;
        }
 
-       hosts = str2charray( hostlist, " " );
+       hosts = ldap_str2charray( hostlist, " " );
 
        if( hosts == NULL ) {
                Debug( LDAP_DEBUG_TRACE, "DNSSRV: str2charrary error\n", 0, 0, 0 );
@@ -73,33 +71,33 @@ dnssrv_back_search(
        }
 
        for( i=0; hosts[i] != NULL; i++) {
-               struct berval *url = ch_malloc( sizeof( struct berval ) ); 
+               struct berval url;
 
-               url->bv_len = sizeof("ldap://")-1 + strlen(hosts[i]);
-               url->bv_val = ch_malloc( url->bv_len + 1 );
+               url.bv_len = sizeof("ldap://")-1 + 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, "ldap://" );
+               strcpy( &url.bv_val[sizeof("ldap://")-1], hosts[i] );
 
-               if( ber_bvecadd( &urls, url ) < 0 ) {
-                       ber_bvfree( url );
+               if( ber_bvarray_add( &urls, &url ) < 0 ) {
+                       free( url.bv_val );
                        send_ldap_result( conn, op, LDAP_OTHER,
-                               NULL, "problem processing DNS SRV records for DN",
-                               NULL, NULL );
+                       NULL, "problem processing DNS SRV records for DN",
+                       NULL, NULL );
                        goto done;
                }
        }
 
        Statslog( LDAP_DEBUG_STATS,
-           "conn=%ld op=%d DNSSRV p=%d dn=\"%s\" url=\"%s\"\n",
+           "conn=%lu op=%lu DNSSRV p=%d dn=\"%s\" url=\"%s\"\n",
            op->o_connid, op->o_opid, op->o_protocol,
-               dn->bv_len ? dn->bv_val : "", urls[0]->bv_val );
+               dn->bv_len ? dn->bv_val : "", urls[0].bv_val );
 
        Debug( LDAP_DEBUG_TRACE,
                "DNSSRV: ManageDSAit scope=%d dn=\"%s\" -> url=\"%s\"\n",
                scope,
                dn->bv_len ? dn->bv_val : "",
-               urls[0]->bv_val );
+               urls[0].bv_val );
 
        rc = ldap_domain2dn(domain, &refdn);
 
@@ -123,7 +121,7 @@ dnssrv_back_search(
                }
        }
 
-       if( strcmp( nrefdn.bv_val, ndn->bv_val ) != 0 ) {
+       if( !dn_match( &nrefdn, ndn ) ) {
                /* requested dn is subordinate */
 
                Debug( LDAP_DEBUG_TRACE,
@@ -141,8 +139,7 @@ dnssrv_back_search(
                        NULL, NULL, NULL, NULL );
 
        } else {
-               struct berval   val;
-               struct berval   *vals[2];
+               struct berval   vals[2];
                Entry *e = ch_calloc( 1, sizeof(Entry) );
                AttributeDescription *ad_objectClass
                        = slap_schema.si_ad_objectClass;
@@ -155,19 +152,18 @@ dnssrv_back_search(
                e->e_attrs = NULL;
                e->e_private = NULL;
 
-               vals[0] = &val;
-               vals[1] = NULL;
+               vals[1].bv_val = NULL;
 
-               val.bv_val = "top";
-               val.bv_len = sizeof("top")-1;
+               vals[0].bv_val = "top";
+               vals[0].bv_len = sizeof("top")-1;
                attr_merge( e, ad_objectClass, vals );
 
-               val.bv_val = "referral";
-               val.bv_len = sizeof("referral")-1;
+               vals[0].bv_val = "referral";
+               vals[0].bv_len = sizeof("referral")-1;
                attr_merge( e, ad_objectClass, vals );
 
-               val.bv_val = "extensibleObject";
-               val.bv_len = sizeof("extensibleObject")-1;
+               vals[0].bv_val = "extensibleObject";
+               vals[0].bv_len = sizeof("extensibleObject")-1;
                attr_merge( e, ad_objectClass, vals );
 
                {
@@ -178,17 +174,17 @@ dnssrv_back_search(
 
                        if( rc == LDAP_SUCCESS ) {
                                char *p;
-                               val.bv_val = ch_strdup( domain );
+                               vals[0].bv_val = ch_strdup( domain );
 
-                               p = strchr( val.bv_val, '.' );
+                               p = strchr( vals[0].bv_val, '.' );
                                        
-                               if( p == val.bv_val ) {
-                                       val.bv_val[1] = '\0';
+                               if( p == vals[0].bv_val ) {
+                                       vals[0].bv_val[1] = '\0';
                                } else if ( p != NULL ) {
                                        *p = '\0';
                                }
 
-                               val.bv_len = strlen(val.bv_val);
+                               vals[0].bv_len = strlen(vals[0].bv_val);
                                attr_merge( e, ad, vals );
                        }
                }
@@ -200,8 +196,8 @@ dnssrv_back_search(
                        rc = slap_str2ad( "associatedDomain", &ad, &text );
 
                        if( rc == LDAP_SUCCESS ) {
-                               val.bv_val = domain;
-                               val.bv_len = strlen(domain);
+                               vals[0].bv_val = domain;
+                               vals[0].bv_len = strlen(domain);
                                attr_merge( e, ad, vals );
                        }
                }
@@ -227,7 +223,7 @@ dnssrv_back_search(
 done:
        if( domain != NULL ) ch_free( domain );
        if( hostlist != NULL ) ch_free( hostlist );
-       if( hosts != NULL ) charray_free( hosts );
-       if( urls != NULL ) ber_bvecfree( urls );
+       if( hosts != NULL ) ldap_charray_free( hosts );
+       if( urls != NULL ) ber_bvarray_free( urls );
        return 0;
 }