X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-dnssrv%2Fsearch.c;h=f0077d5bd0c5777bfda958b2434791e975cbe2fa;hb=1586a68219cf85e9caaafcf2259c9bc249358077;hp=6658191cc8efb9ca58c21ed64a771c8699ef1127;hpb=79ebfbc4fe7ff53c49eadac57210b1396e63d016;p=openldap

diff --git a/servers/slapd/back-dnssrv/search.c b/servers/slapd/back-dnssrv/search.c
index 6658191cc8..f0077d5bd0 100644
--- a/servers/slapd/back-dnssrv/search.c
+++ b/servers/slapd/back-dnssrv/search.c
@@ -1,10 +1,23 @@
 /* search.c - DNS SRV backend search function */
 /* $OpenLDAP$ */
-/*
- * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2003 The OpenLDAP Foundation.
+ * Portions Copyright 2000-2003 Kurt D. Zeilenga.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by Kurt D. Zeilenga for inclusion
+ * in OpenLDAP Software.
  */
-
 
 #include "portable.h"
 
@@ -19,140 +32,151 @@
 
 int
 dnssrv_back_search(
-    Backend	*be,
-    Connection	*conn,
     Operation	*op,
-    const char	*dn,
-    const char	*ndn,
-    int		scope,
-    int		deref,
-    int		size,
-    int		time,
-    Filter	*filter,
-    const char	*filterstr,
-    char	**attrs,
-    int		attrsonly )
+    SlapReply	*rs )
 {
 	int i;
 	int rc;
 	char *domain = NULL;
 	char *hostlist = NULL;
 	char **hosts = NULL;
-	char *refdn, *nrefdn;
-	struct berval **urls = NULL;
-
-	assert( get_manageDSAit( op ) );
+	char *refdn;
+	struct berval nrefdn = { 0, NULL };
+	BerVarray urls = NULL;
+	int manageDSAit;
+
+	rs->sr_ref = NULL;
+
+	manageDSAit = get_manageDSAit( op );
+	/*
+	 * FIXME: we may return a referral if manageDSAit is not set
+	 */
+	if ( ! manageDSAit ) {
+		send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+				"manageDSAit must be set" );
+		goto done;
+	}
 
-	if( ldap_dn2domain( dn, &domain ) ) {
-		send_ldap_result( conn, op, LDAP_REFERRAL,
-			NULL, NULL, default_referral, NULL );
+	if( ldap_dn2domain( op->o_req_dn.bv_val, &domain ) || domain == NULL ) {
+		rs->sr_err = LDAP_REFERRAL;
+		rs->sr_ref = default_referral;
+		send_ldap_result( op, rs );
+		rs->sr_ref = NULL;
 		goto done;
 	}
 
 	Debug( LDAP_DEBUG_TRACE, "DNSSRV: dn=\"%s\" -> domain=\"%s\"\n",
-		dn == NULL ? "" : dn,
-		domain == NULL ? "" : domain,
-		0 );
+		op->o_req_dn.bv_len ? op->o_req_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,
-			NULL, "no DNS SRV RR available for DN", NULL, NULL );
+		send_ldap_error( op, rs, LDAP_NO_SUCH_OBJECT,
+			"no DNS SRV RR available for DN" );
 		goto done;
 	}
 
-	hosts = str2charray( hostlist, " " );
+	hosts = ldap_str2charray( hostlist, " " );
 
 	if( hosts == NULL ) {
 		Debug( LDAP_DEBUG_TRACE, "DNSSRV: str2charrary error\n", 0, 0, 0 );
-		send_ldap_result( conn, op, LDAP_OTHER,
-			NULL, "problem processing DNS SRV records for DN", NULL, NULL );
+		send_ldap_error( op, rs, LDAP_OTHER,
+			"problem processing DNS SRV records for DN" );
 		goto done;
 	}
 
 	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 );
-			send_ldap_result( conn, op, LDAP_OTHER,
-				NULL, "problem processing DNS SRV records for DN",
-				NULL, NULL );
+		if( ber_bvarray_add( &urls, &url ) < 0 ) {
+			free( url.bv_val );
+			send_ldap_error( op, rs, LDAP_OTHER,
+			"problem processing DNS SRV records for DN" );
 			goto done;
 		}
 	}
 
 	Statslog( LDAP_DEBUG_STATS,
-	    "conn=%ld op=%d DNSSRV p=%d dn=\"%s\" url=\"%s\"\n",
-	    op->o_connid, op->o_opid, op->o_protocol, dn, urls[0]->bv_val );
+	    "conn=%lu op=%lu DNSSRV p=%d dn=\"%s\" url=\"%s\"\n",
+	    op->o_connid, op->o_opid, op->o_protocol,
+		op->o_req_dn.bv_len ? op->o_req_dn.bv_val : "", urls[0].bv_val );
 
-	Debug( LDAP_DEBUG_TRACE, "DNSSRV: ManageDSAit dn=\"%s\" -> url=\"%s\"\n",
-		dn == NULL ? "" : dn,
-		urls[0]->bv_val, 0 );
+	Debug( LDAP_DEBUG_TRACE,
+		"DNSSRV: ManageDSAit scope=%d dn=\"%s\" -> url=\"%s\"\n",
+		op->oq_search.rs_scope,
+		op->o_req_dn.bv_len ? op->o_req_dn.bv_val : "",
+		urls[0].bv_val );
 
 	rc = ldap_domain2dn(domain, &refdn);
 
 	if( rc != LDAP_SUCCESS ) {
-		send_ldap_result( conn, op, LDAP_OTHER,
-			NULL, "DNS SRV problem processing manageDSAit control",
-			NULL, NULL );
+		send_ldap_error( op, rs, LDAP_OTHER,
+			"DNS SRV problem processing manageDSAit control" );
 		goto done;
-	}
 
-	nrefdn = ch_strdup( refdn );
-	dn_normalize(nrefdn);
+	} else {
+		struct berval bv;
+		bv.bv_val = refdn;
+		bv.bv_len = strlen( refdn );
+
+		rc = dnNormalize( 0, NULL, NULL, &bv, &nrefdn, op->o_tmpmemctx );
+		if( rc != LDAP_SUCCESS ) {
+			send_ldap_error( op, rs, LDAP_OTHER,
+				"DNS SRV problem processing manageDSAit control" );
+			goto done;
+		}
+	}
 
-	if( strcmp( nrefdn, ndn ) != 0 ) {
+	if( !dn_match( &nrefdn, &op->o_req_ndn ) ) {
 		/* requested dn is subordinate */
 
 		Debug( LDAP_DEBUG_TRACE,
-				"DNSSRV: dn=\"%s\" subordindate to refdn=\"%s\"\n",
-				dn == NULL ? "" : dn,
-				refdn == NULL ? "" : refdn,
-				NULL );
+			"DNSSRV: dn=\"%s\" subordinate to refdn=\"%s\"\n",
+			op->o_req_dn.bv_len ? op->o_req_dn.bv_val : "",
+			refdn == NULL ? "" : refdn,
+			NULL );
 
-		send_ldap_result( conn, op, LDAP_NO_SUCH_OBJECT,
-			refdn, NULL,
-			NULL, NULL );
+		rs->sr_matched = refdn;
+		rs->sr_err = LDAP_NO_SUCH_OBJECT;
+		send_ldap_result( op, rs );
+		rs->sr_matched = NULL;
 
-	} else if ( scope == LDAP_SCOPE_ONELEVEL ) {
-		send_ldap_result( conn, op, LDAP_SUCCESS,
-			NULL, NULL, NULL, NULL );
+	} else if ( op->oq_search.rs_scope == LDAP_SCOPE_ONELEVEL ) {
+		send_ldap_error( op, rs, LDAP_SUCCESS, 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;
 		AttributeDescription *ad_ref = slap_schema.si_ad_ref;
-		e->e_dn = strdup( dn );
-		e->e_ndn = strdup( ndn );
+		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[0] = &val;
-		vals[1] = NULL;
+		vals[1].bv_val = NULL;
 
-		val.bv_val = "top";
-		val.bv_len = sizeof("top")-1;
-		attr_merge( e, ad_objectClass, vals );
+		vals[0].bv_val = "top";
+		vals[0].bv_len = sizeof("top")-1;
+		attr_mergeit( e, ad_objectClass, vals );
 
-		val.bv_val = "referral";
-		val.bv_len = sizeof("referral")-1;
-		attr_merge( e, ad_objectClass, vals );
+		vals[0].bv_val = "referral";
+		vals[0].bv_len = sizeof("referral")-1;
+		attr_mergeit( e, ad_objectClass, vals );
 
-		val.bv_val = "extensibleObject";
-		val.bv_len = sizeof("extensibleObject")-1;
-		attr_merge( e, ad_objectClass, vals );
+		vals[0].bv_val = "extensibleObject";
+		vals[0].bv_len = sizeof("extensibleObject")-1;
+		attr_mergeit( e, ad_objectClass, vals );
 
 		{
 			AttributeDescription *ad = NULL;
@@ -162,20 +186,18 @@ 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);
-				attr_merge( e, ad, vals );
-
-				ad_free( ad, 1 );
+				vals[0].bv_len = strlen(vals[0].bv_val);
+				attr_mergeit( e, ad, vals );
 			}
 		}
 
@@ -186,36 +208,38 @@ dnssrv_back_search(
 			rc = slap_str2ad( "associatedDomain", &ad, &text );
 
 			if( rc == LDAP_SUCCESS ) {
-				val.bv_val = domain;
-				val.bv_len = strlen(domain);
-				attr_merge( e, ad, vals );
-
-				ad_free( ad, 1 );
+				vals[0].bv_val = domain;
+				vals[0].bv_len = strlen(domain);
+				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 ); 
+		rc = test_filter( op, e, op->oq_search.rs_filter ); 
 
 		if( rc == LDAP_COMPARE_TRUE ) {
-			send_search_entry( be, conn, op,
-				e, attrs, attrsonly, NULL );
+			rs->sr_entry = e;
+			rs->sr_attrs = op->oq_search.rs_attrs;
+			send_search_entry( op, rs );
+			rs->sr_entry = NULL;
+			rs->sr_attrs = NULL;
 		}
 
 		entry_free( e );
-			
-		send_ldap_result( conn, op, LDAP_SUCCESS,
-			NULL, NULL, NULL, NULL );
+
+		rs->sr_err = LDAP_SUCCESS;
+		send_ldap_result( op, rs );
 	}
 
-	free( refdn );
-	free( nrefdn );
+	if ( refdn ) free( refdn );
+	if ( nrefdn.bv_val ) free( nrefdn.bv_val );
 
 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;
 }
+