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 c85940ffaa61b4ec24f9dcbb10f40b4bba5e1db8..ea8dfe4775d2b5ae09d00fd853613cc70b20a26f 100644 (file)
--- 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 1788e93fc5c7a2091dd4f57c2c4516c4d290e4c4..6b743c96dac81a395f63de96dc5631fede6b5724 100644 (file)
--- 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 );