Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
openldap
OpenLDAP
Commits
4dc974c5
Commit
4dc974c5
authored
Sep 12, 2020
by
Howard Chu
Committed by
Quanah Gibson-Mount
Sep 16, 2020
Browse files
ITS
#9345
syncrepl: call check_syncprov on freshly started consumer
parent
fd861d1d
Pipeline
#995
passed with stage
in 62 minutes and 48 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
servers/slapd/syncrepl.c
View file @
4dc974c5
...
...
@@ -851,22 +851,19 @@ do_syncrep1(
}
ldap_pvt_thread_mutex_unlock
(
&
si
->
si_cookieState
->
cs_mutex
);
}
}
ch_free
(
si
->
si_syncCookie
.
octet_str
.
bv_val
);
slap_compose_sync_cookie
(
NULL
,
&
si
->
si_syncCookie
.
octet_str
,
si
->
si_syncCookie
.
ctxcsn
,
si
->
si_syncCookie
.
rid
,
si
->
si_syncCookie
.
sid
);
}
else
{
/* ITS#6367: recreate the cookie so it has our SID, not our peer's */
ch_free
(
si
->
si_syncCookie
.
octet_str
.
bv_val
);
BER_BVZERO
(
&
si
->
si_syncCookie
.
octet_str
);
/* Look for contextCSN from syncprov overlay. */
check_syncprov
(
op
,
si
);
if
(
BER_BVISNULL
(
&
si
->
si_syncCookie
.
octet_str
))
slap_compose_sync_cookie
(
NULL
,
&
si
->
si_syncCookie
.
octet_str
,
si
->
si_syncCookie
.
ctxcsn
,
si
->
si_syncCookie
.
rid
,
si
->
si_syncCookie
.
sid
);
}
if
(
!
cmdline_cookie_found
)
{
/* ITS#6367: recreate the cookie so it has our SID, not our peer's */
ch_free
(
si
->
si_syncCookie
.
octet_str
.
bv_val
);
BER_BVZERO
(
&
si
->
si_syncCookie
.
octet_str
);
/* Look for contextCSN from syncprov overlay. */
check_syncprov
(
op
,
si
);
if
(
BER_BVISNULL
(
&
si
->
si_syncCookie
.
octet_str
))
slap_compose_sync_cookie
(
NULL
,
&
si
->
si_syncCookie
.
octet_str
,
si
->
si_syncCookie
.
ctxcsn
,
si
->
si_syncCookie
.
rid
,
si
->
si_syncCookie
.
sid
);
}
si
->
si_refreshDone
=
0
;
Debug
(
LDAP_DEBUG_SYNC
,
"do_syncrep1: %s starting refresh (sending cookie=%s)
\n
"
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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