Commit e5b88e1a authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6394 rid is decimal not hex

parent 1e2ac911
...@@ -20,6 +20,7 @@ OpenLDAP 2.4.20 Engineering ...@@ -20,6 +20,7 @@ OpenLDAP 2.4.20 Engineering
Fixed slapd inclusion of ac/unistd.h (ITS#6342) Fixed slapd inclusion of ac/unistd.h (ITS#6342)
Fixed slapd invalid dn log message (ITS#6309) Fixed slapd invalid dn log message (ITS#6309)
Fixed slapd lockup on shutdown (ITS#6372) Fixed slapd lockup on shutdown (ITS#6372)
Fixed slapd RID range to be decimal only (ITS#6394)
Fixed slapd sl_free to better reclaim memory (ITS#6380) Fixed slapd sl_free to better reclaim memory (ITS#6380)
Fixed slapd syncrepl deletes in MirrorMode (ITS#6368) Fixed slapd syncrepl deletes in MirrorMode (ITS#6368)
Fixed slapd syncrepl to use correct SID (ITS#6367) Fixed slapd syncrepl to use correct SID (ITS#6367)
......
...@@ -1676,7 +1676,7 @@ replication engine. ...@@ -1676,7 +1676,7 @@ replication engine.
identifies the current identifies the current
.B syncrepl .B syncrepl
directive within the replication consumer site. directive within the replication consumer site.
It is a non-negative integer having no more than three digits. It is a non-negative integer having no more than three decimal digits.
.B provider .B provider
specifies the replication provider site containing the master content specifies the replication provider site containing the master content
......
...@@ -1663,8 +1663,8 @@ replication engine. ...@@ -1663,8 +1663,8 @@ replication engine.
identifies the current identifies the current
.B syncrepl .B syncrepl
directive within the replication consumer site. directive within the replication consumer site.
It is a non-negative integer not greater than 4095 (limited It is a non-negative integer not greater than 999 (limited
to three hexadecimal digits). to three decimal digits).
.B provider .B provider
specifies the replication provider site containing the master content specifies the replication provider site containing the master content
......
...@@ -4027,10 +4027,10 @@ parse_syncrepl_line( ...@@ -4027,10 +4027,10 @@ parse_syncrepl_line(
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 ); Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return -1; return -1;
} }
if ( tmp > SLAP_SYNC_SID_MAX || tmp < 0 ) { if ( tmp > SLAP_SYNC_RID_MAX || tmp < 0 ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ), snprintf( c->cr_msg, sizeof( c->cr_msg ),
"Error: parse_syncrepl_line: " "Error: parse_syncrepl_line: "
"syncrepl id %d is out of range [0..4095]", tmp ); "syncrepl id %d is out of range [0..%d]", tmp, SLAP_SYNC_RID_MAX );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 ); Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return -1; return -1;
} }
...@@ -4555,7 +4555,7 @@ syncrepl_unparse( syncinfo_t *si, struct berval *bv ) ...@@ -4555,7 +4555,7 @@ syncrepl_unparse( syncinfo_t *si, struct berval *bv )
si->si_bindconf.sb_version = LDAP_VERSION3; si->si_bindconf.sb_version = LDAP_VERSION3;
ptr = buf; ptr = buf;
assert( si->si_rid >= 0 && si->si_rid <= SLAP_SYNC_SID_MAX ); assert( si->si_rid >= 0 && si->si_rid <= SLAP_SYNC_RID_MAX );
len = snprintf( ptr, WHATSLEFT, IDSTR "=%03d " PROVIDERSTR "=%s", len = snprintf( ptr, WHATSLEFT, IDSTR "=%03d " PROVIDERSTR "=%s",
si->si_rid, si->si_bindconf.sb_uri.bv_val ); si->si_rid, si->si_bindconf.sb_uri.bv_val );
if ( len >= sizeof( buf ) ) return; if ( len >= sizeof( buf ) ) return;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment