From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 6 Aug 2007 14:47:54 +0000 (+0000)
Subject: import fix to ITS#4322
X-Git-Tag: OPENLDAP_REL_ENG_2_3_38~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c32fc371a92f6f8e9d4ba010aa5cc9777fbe64c1;p=thirdparty%2Fopenldap.git

import fix to ITS#4322
---

diff --git a/CHANGES b/CHANGES
index b9ba5492d3..929fdcebf4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ OpenLDAP 2.3.38 Engineering
 	Fixed slapd select_backend/ManageDSAit (ITS#4986)
 	Fixed slapd-bdb missing index warning (ITS#5037)
 	Fixed slapd-bdb Quick index for ID 0 (ITS#5052)
+	Fixed slapd-relay multiple "relay" check (ITS#4322)
 	Fixed slapo-syncprov uninit'd vars (ITS#5048,#5049)
 	Fixed libldap ldap_add_result_entry (ITS#5056)
 	Removed lint
diff --git a/servers/slapd/back-relay/config.c b/servers/slapd/back-relay/config.c
index 8ed90b3e72..d7b9b8a06c 100644
--- a/servers/slapd/back-relay/config.c
+++ b/servers/slapd/back-relay/config.c
@@ -48,6 +48,14 @@ relay_back_db_config(
 		int		rc;
 		BackendDB	*bd;
 
+		if ( !BER_BVISNULL( &ri->ri_realsuffix ) ) {
+			Debug( LDAP_DEBUG_ANY,
+				"%s: line %d: "
+				"relay dn already specified.\n",
+				fname, lineno, 0 );
+			return 1;
+		}
+
 		if ( argc < 2 ) {
 			fprintf( stderr,
 	"%s: line %d: missing relay suffix in \"relay <dn> [massage]\" line\n",