Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joe Martin
OpenLDAP
Commits
e5b88e1a
Commit
e5b88e1a
authored
Nov 22, 2009
by
Quanah Gibson-Mount
Browse files
ITS#6394 rid is decimal not hex
parent
1e2ac911
Changes
4
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
e5b88e1a
...
...
@@ -20,6 +20,7 @@ OpenLDAP 2.4.20 Engineering
Fixed slapd inclusion of ac/unistd.h (ITS#6342)
Fixed slapd invalid dn log message (ITS#6309)
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 syncrepl deletes in MirrorMode (ITS#6368)
Fixed slapd syncrepl to use correct SID (ITS#6367)
...
...
doc/man/man5/slapd-config.5
View file @
e5b88e1a
...
...
@@ -1676,7 +1676,7 @@ replication engine.
identifies the current
.B syncrepl
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
specifies the replication provider site containing the master content
...
...
doc/man/man5/slapd.conf.5
View file @
e5b88e1a
...
...
@@ -1663,8 +1663,8 @@ replication engine.
identifies the current
.B syncrepl
directive within the replication consumer site.
It is a non-negative integer not greater than
4095
(limited
to three
hexa
decimal digits).
It is a non-negative integer not greater than
999
(limited
to three decimal digits).
.B provider
specifies the replication provider site containing the master content
...
...
servers/slapd/syncrepl.c
View file @
e5b88e1a
...
...
@@ -4027,10 +4027,10 @@ parse_syncrepl_line(
Debug
(
LDAP_DEBUG_ANY
,
"%s: %s.
\n
"
,
c
->
log
,
c
->
cr_msg
,
0
);
return
-
1
;
}
if
(
tmp
>
SLAP_SYNC_
S
ID_MAX
||
tmp
<
0
)
{
if
(
tmp
>
SLAP_SYNC_
R
ID_MAX
||
tmp
<
0
)
{
snprintf
(
c
->
cr_msg
,
sizeof
(
c
->
cr_msg
),
"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
);
return
-
1
;
}
...
...
@@ -4555,7 +4555,7 @@ syncrepl_unparse( syncinfo_t *si, struct berval *bv )
si
->
si_bindconf
.
sb_version
=
LDAP_VERSION3
;
ptr
=
buf
;
assert
(
si
->
si_rid
>=
0
&&
si
->
si_rid
<=
SLAP_SYNC_
S
ID_MAX
);
assert
(
si
->
si_rid
>=
0
&&
si
->
si_rid
<=
SLAP_SYNC_
R
ID_MAX
);
len
=
snprintf
(
ptr
,
WHATSLEFT
,
IDSTR
"=%03d "
PROVIDERSTR
"=%s"
,
si
->
si_rid
,
si
->
si_bindconf
.
sb_uri
.
bv_val
);
if
(
len
>=
sizeof
(
buf
)
)
return
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment