Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joe Martin
OpenLDAP
Commits
30778bda
Commit
30778bda
authored
Sep 04, 2020
by
Howard Chu
Committed by
Quanah Gibson-Mount
Sep 04, 2020
Browse files
ITS#9338 syncrepl: Don't reuse existing connection on Refresh fallback
parent
73085ff0
Changes
1
Hide whitespace changes
Inline
Side-by-side
servers/slapd/syncrepl.c
View file @
30778bda
...
...
@@ -1548,7 +1548,8 @@ done:
if
(
msg
)
ldap_msgfree
(
msg
);
if
(
rc
&&
rc
!=
LDAP_SYNC_REFRESH_REQUIRED
&&
si
->
si_ld
)
{
if
(
rc
)
{
/* never reuse existing connection */
if
(
si
->
si_conn
)
{
connection_client_stop
(
si
->
si_conn
);
si
->
si_conn
=
NULL
;
...
...
@@ -1661,6 +1662,7 @@ do_syncrepl(
if
(
!
si
->
si_schemachecking
)
op
->
o_no_schema_check
=
1
;
reload:
/* Establish session, do search */
if
(
!
si
->
si_ld
)
{
si
->
si_refreshDelete
=
0
;
...
...
@@ -1678,7 +1680,6 @@ do_syncrepl(
rc
=
do_syncrep1
(
op
,
si
);
}
reload:
/* Process results */
if
(
rc
==
LDAP_SUCCESS
)
{
ldap_get_option
(
si
->
si_ld
,
LDAP_OPT_DESC
,
&
s
);
...
...
@@ -1689,11 +1690,6 @@ reload:
op
->
o_ndn
=
op
->
o_bd
->
be_rootndn
;
rc
=
do_syncrep2
(
op
,
si
);
if
(
rc
==
LDAP_SYNC_REFRESH_REQUIRED
)
{
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
);
rc
=
ldap_sync_search
(
si
,
op
->
o_tmpmemctx
);
goto
reload
;
}
...
...
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