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
6c498b66
Commit
6c498b66
authored
Feb 10, 2009
by
Quanah Gibson-Mount
Browse files
ITS#5935
parent
6693843c
Changes
3
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
6c498b66
...
...
@@ -32,6 +32,7 @@ OpenLDAP 2.4.14 Engineering
Fixed slapd syncrepl replication with glued DB (ITS#5866)
Fixed slapd syncrepl replication with moddn (ITS#5901)
Fixed slapd syncrepl replication with referrals (ITS#5881)
Fixed slapd syncrepl replication with config tree (ITS#5935)
Fixed slapd wake_sds close on Windows (ITS#5855)
Fixed slapd-bdb/hdb dncachesize handling (ITS#5860)
Fixed slapd-bdb/hdb RFC4528 control support (ITS#5861)
...
...
servers/slapd/syncrepl.c
View file @
6c498b66
...
...
@@ -1442,22 +1442,7 @@ reload:
/* Do final delete cleanup */
if
(
!
si
->
si_ctype
)
{
cookie_state
*
cs
=
NULL
;
syncinfo_t
**
sip
;
cs
=
be
->
be_syncinfo
->
si_cookieState
;
for
(
sip
=
&
be
->
be_syncinfo
;
*
sip
!=
si
;
sip
=
&
(
*
sip
)
->
si_next
);
*
sip
=
si
->
si_next
;
syncinfo_free
(
si
,
0
);
if
(
!
be
->
be_syncinfo
)
{
SLAP_DBFLAGS
(
be
)
&=
~
(
SLAP_DBFLAG_SHADOW
|
SLAP_DBFLAG_SYNC_SHADOW
);
if
(
cs
)
{
ch_free
(
cs
->
cs_sids
);
ber_bvarray_free
(
cs
->
cs_vals
);
ldap_pvt_thread_mutex_destroy
(
&
cs
->
cs_mutex
);
ch_free
(
cs
);
}
}
}
return
NULL
;
}
...
...
@@ -4538,9 +4523,11 @@ syncrepl_config( ConfigArgs *c )
* happen when running on the cn=config DB.
*/
if
(
si
->
si_re
)
{
ldap_pvt_thread_mutex_lock
(
&
slapd_rq
.
rq_mutex
);
isrunning
=
ldap_pvt_runqueue_isrunning
(
&
slapd_rq
,
si
->
si_re
);
ldap_pvt_thread_mutex_unlock
(
&
slapd_rq
.
rq_mutex
);
if
(
ldap_pvt_thread_mutex_trylock
(
&
si
->
si_mutex
))
{
isrunning
=
1
;
}
else
{
ldap_pvt_thread_mutex_unlock
(
&
si
->
si_mutex
);
}
}
if
(
si
->
si_re
&&
isrunning
)
{
si
->
si_ctype
=
0
;
...
...
@@ -4557,6 +4544,7 @@ syncrepl_config( ConfigArgs *c )
if
(
!
c
->
be
->
be_syncinfo
)
{
SLAP_DBFLAGS
(
c
->
be
)
&=
~
SLAP_DBFLAG_SHADOW_MASK
;
if
(
cs
)
{
ch_free
(
cs
->
cs_sids
);
ber_bvarray_free
(
cs
->
cs_vals
);
ldap_pvt_thread_mutex_destroy
(
&
cs
->
cs_mutex
);
ch_free
(
cs
);
...
...
tests/scripts/test049-sync-config
View file @
6c498b66
...
...
@@ -315,6 +315,18 @@ if test $RC != 0 ; then
exit
$RC
fi
echo
"Replacing olcSyncrepl on producer..."
$LDAPMODIFY
-D
cn
=
config
-H
$URI1
-y
$CONFIGPWF
<<
EOF
>>
$TESTOUT
2>&1
dn: olcDatabase={0}config,cn=config
changetype: modify
replace: olcSyncRepl
olcSyncRepl: rid=002 provider=
$URI1
binddn="cn=config" bindmethod=simple
credentials=
$CONFIGPW
searchbase="cn=config" type=refreshAndPersist
retry="3 5 300 5" timeout=3
EOF
echo
"Waiting
$SLEEP1
seconds for syncrepl to receive changes..."
sleep
$SLEEP1
echo
"Using ldapsearch to read config from the producer..."
$LDAPSEARCH
-b
cn
=
config
-D
cn
=
config
-H
$URI1
-y
$CONFIGPWF
\
'objectclass=*'
>
$MASTEROUT
2>&1
...
...
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