X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-dnssrv%2Freferral.c;h=10da6a724ad43c2adea27b4f796f4105906e7466;hb=fd6259bfd1cc58b1f14a764178f86d9c40df8260;hp=aa9a40a01c5d9839e5d922204a9eafd034dc756a;hpb=17a36b757c41afa4d0f79d56e8fb9e7a56847bde;p=openldap

diff --git a/servers/slapd/back-dnssrv/referral.c b/servers/slapd/back-dnssrv/referral.c
index aa9a40a01c..10da6a724a 100644
--- a/servers/slapd/back-dnssrv/referral.c
+++ b/servers/slapd/back-dnssrv/referral.c
@@ -1,8 +1,22 @@
 /* referral.c - DNS SRV backend referral handler */
 /* $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-2006 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"
@@ -13,26 +27,30 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "external.h"
+#include "proto-dnssrv.h"
 
 int
 dnssrv_back_referrals(
-    Backend	*be,
-    Connection	*conn,
     Operation	*op,
-    struct berval *dn,
-    struct berval *ndn,
-	const char **text )
+    SlapReply	*rs )
 {
 	int i;
 	int rc = LDAP_OTHER;
 	char *domain = NULL;
 	char *hostlist = NULL;
 	char **hosts = NULL;
-	BVarray urls = NULL;
+	BerVarray urls = NULL;
+
+	if ( BER_BVISEMPTY( &op->o_req_dn ) ) {
+#ifdef LDAP_DEVEL
+		/* FIXME: need some means to determine whether the database
+		 * is a glue instance */
+		if ( SLAP_GLUE_INSTANCE( op->o_bd ) ) {
+			return LDAP_SUCCESS;
+		}
+#endif /* LDAP_DEVEL */
 
-	if( ndn->bv_len == 0 ) {
-		*text = "DNS SRV operation upon null (empty) DN disallowed";
+		rs->sr_text = "DNS SRV operation upon null (empty) DN disallowed";
 		return LDAP_UNWILLING_TO_PERFORM;
 	}
 
@@ -41,69 +59,73 @@ dnssrv_back_referrals(
 			return LDAP_SUCCESS;
 		}
 
-		*text = "DNS SRV problem processing manageDSAit control";
+		rs->sr_text = "DNS SRV problem processing manageDSAit control";
 		return LDAP_OTHER;
 	} 
 
-	if( ldap_dn2domain( dn->bv_val, &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;
 		return LDAP_REFERRAL;
 	}
 
 	Debug( LDAP_DEBUG_TRACE, "DNSSRV: dn=\"%s\" -> domain=\"%s\"\n",
-		dn->bv_val,
-		domain == NULL ? "" : domain,
-		0 );
+		op->o_req_dn.bv_val, domain, 0 );
 
-	if( rc = ldap_domain2hostlist( domain, &hostlist ) ) {
+	i = ldap_domain2hostlist( domain, &hostlist );
+	if ( i ) {
 		Debug( LDAP_DEBUG_TRACE,
 			"DNSSRV: domain2hostlist(%s) returned %d\n",
-			domain, rc, 0 );
-		*text = "no DNS SRV RR available for DN";
+			domain, i, 0 );
+		rs->sr_text = "no DNS SRV RR available for DN";
 		rc = LDAP_NO_SUCH_OBJECT;
 		goto done;
 	}
 
-	hosts = str2charray( hostlist, " " );
+	hosts = ldap_str2charray( hostlist, " " );
 
 	if( hosts == NULL ) {
 		Debug( LDAP_DEBUG_TRACE, "DNSSRV: str2charrary error\n", 0, 0, 0 );
-		*text = "problem processing DNS SRV records for DN";
+		rs->sr_text = "problem processing DNS SRV records for DN";
 		goto done;
 	}
 
 	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 ( bvarray_add( &urls, &url ) < 0 ) {
+		if ( ber_bvarray_add( &urls, &url ) < 0 ) {
 			free( url.bv_val );
-			*text = "problem processing DNS SRV records for DN";
+			rs->sr_text = "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->bv_val, urls[0].bv_val );
+	    "%s DNSSRV p=%d dn=\"%s\" url=\"%s\"\n",
+	    op->o_log_prefix, op->o_protocol,
+		op->o_req_dn.bv_val, urls[0].bv_val, 0 );
 
 	Debug( LDAP_DEBUG_TRACE, "DNSSRV: dn=\"%s\" -> url=\"%s\"\n",
-		dn->bv_val, urls[0].bv_val, 0 );
+		op->o_req_dn.bv_val, urls[0].bv_val, 0 );
 
-	send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-		NULL, "DNS SRV generated referrals", urls, NULL );
+	rs->sr_ref = urls;
+	send_ldap_error( op, rs, LDAP_REFERRAL,
+		"DNS SRV generated referrals" );
+	rs->sr_ref = NULL;
+	rc = LDAP_REFERRAL;
 
 done:
 	if( domain != NULL ) ch_free( domain );
 	if( hostlist != NULL ) ch_free( hostlist );
-	if( hosts != NULL ) charray_free( hosts );
-	bvarray_free( urls );
+	if( hosts != NULL ) ldap_charray_free( hosts );
+	ber_bvarray_free( urls );
 	return rc;
 }