From: Howard Chu <hyc@openldap.org>
Date: Fri, 30 Sep 2011 09:10:37 +0000 (-0700)
Subject: ITS#7037 fix syncrepl_add_glue for empty suffix
X-Git-Tag: OPENLDAP_REL_ENG_2_4_27~240
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=47a282ec6b3e3c90c9f7218e13130a34824ae1c4;p=openldap

ITS#7037 fix syncrepl_add_glue for empty suffix
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index af10aee043..3fd5489e53 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -3499,8 +3499,8 @@ syncrepl_add_glue_ancestors(
 	}
 	
 	if ( !BER_BVISEMPTY( &ptr ) ) {
-		dn.bv_len -= ptr.bv_len + 1;
-		dn.bv_val += ptr.bv_len + 1;
+		dn.bv_len -= ptr.bv_len + ( suffrdns != 0 );
+		dn.bv_val += ptr.bv_len + ( suffrdns != 0 );
 	}
 
 	/* the normalizedDNs are always the same length, no counting