import fix to ITS#4322

diff --git a/CHANGES b/CHANGES
index b9ba5492d32624d4a7e515a4651868f5efec6663..929fdcebf484f772b82f7a3c1f5646bf71c480da 100644 (file)
--- 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 8ed90b3e72123c19926dfb68ba86e6b7c9e7d0fa..d7b9b8a06c9dba7d6c40cc23ab58e712cc319577 100644 (file)
--- 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",