From: Howard Chu <hyc@openldap.org>
Date: Thu, 6 Dec 2007 16:55:27 +0000 (+0000)
Subject: Sync with HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_4_7~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=967afb76e31f0bd1589004488f1140b41db67195;p=openldap

Sync with HEAD
---

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index bddbe79283..d4462365ce 100644
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -468,11 +468,11 @@ hdb_dup_compare(
 	cn = (diskNode *)curkey->data;
 
 	/* data is not aligned, cannot compare directly */
-	ul = un->nrdnlen[0] << 8 | un->nrdnlen[1];
-	cl = cn->nrdnlen[0] << 8 | cn->nrdnlen[1];
+	rc = un->nrdnlen[0] - cn->nrdnlen[0];
+	if ( rc ) return rc;
+	rc = un->nrdnlen[1] - cn->nrdnlen[1];
+	if ( rc ) return rc;
 
-	rc = ul - cl;
-	if( rc ) return rc;
 	return strcmp( un->nrdn, cn->nrdn );
 }