From: Hallvard Furuseth <hallvard@openldap.org>
Date: Mon, 23 Jul 2007 21:44:46 +0000 (+0000)
Subject: ITS#5035 part 3: Make struct sync_cookie.rid and struct syncinfo_s.si_rid
X-Git-Tag: OPENLDAP_REL_ENG_2_3_38~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef3fb76e94b41c16d275316cb15a19554835d789;p=thirdparty%2Fopenldap.git

ITS#5035 part 3: Make struct sync_cookie.rid and struct syncinfo_s.si_rid
int instead of long.
---

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index c85940ffaa..ea8dfe4775 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1655,7 +1655,7 @@ struct syncinfo_s;
 struct sync_cookie {
 	struct berval ctxcsn;
 	struct berval octet_str;
-	long rid;
+	int rid;
 	LDAP_STAILQ_ENTRY(sync_cookie) sc_next;
 };
 
diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 1788e93fc5..6b743c96da 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -52,7 +52,7 @@ struct nonpresent_entry {
 typedef struct syncinfo_s {
 	struct slap_backend_db *si_be;
 	struct re_s			*si_re;
-	long				si_rid;
+	int					si_rid;
 	slap_bindconf		si_bindconf;
 	struct berval		si_base;
 	struct berval		si_logbase;
@@ -3316,7 +3316,7 @@ syncrepl_unparse( syncinfo_t *si, struct berval *bv )
 	si->si_bindconf.sb_uri = uri;
 
 	ptr = buf;
-	ptr += snprintf( ptr, sizeof( buf ), IDSTR "=%03ld " PROVIDERSTR "=%s",
+	ptr += snprintf( ptr, sizeof( buf ), IDSTR "=%03d " PROVIDERSTR "=%s",
 		si->si_rid, si->si_bindconf.sb_uri.bv_val );
 	if ( !BER_BVISNULL( &bc )) {
 		ptr = lutil_strcopy( ptr, bc.bv_val );