Add a safety check to bvcasechr

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

diff --git a/servers/slapd/back-dnssrv/search.c b/servers/slapd/back-dnssrv/search.c
index 9bc266b74ae80a6e54cecf77afd9835acdb9048e..a35ab1f446db37510c29a55df0e92ce6a111d79b 100644 (file)
--- a/servers/slapd/back-dnssrv/search.c
+++ b/servers/slapd/back-dnssrv/search.c
@@ -40,7 +40,7 @@ dnssrv_back_search(
        char **hosts = NULL;
        char *refdn;
        struct berval nrefdn = { 0, NULL };
-       BVarray urls = NULL;
+       BerVarray urls = NULL;
 
        assert( get_manageDSAit( op ) );
 
@@ -81,7 +81,7 @@ dnssrv_back_search(
                strcpy( url.bv_val, "ldap://" );
                strcpy( &url.bv_val[sizeof("ldap://")-1], hosts[i] );
 
-               if( bvarray_add( &urls, &url ) < 0 ) {
+               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",
@@ -123,7 +123,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,
@@ -226,6 +226,6 @@ done:
        if( domain != NULL ) ch_free( domain );
        if( hostlist != NULL ) ch_free( hostlist );
        if( hosts != NULL ) charray_free( hosts );
-       if( urls != NULL ) bvarray_free( urls );
+       if( urls != NULL ) ber_bvarray_free( urls );
        return 0;
 }