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
665f334b
Commit
665f334b
authored
Jun 12, 2016
by
Hallvard Furuseth
Committed by
Quanah Gibson-Mount
Nov 04, 2016
Browse files
ITS#8435 Fix uninited slap_callback.sc_writewait
parent
d2acb1dd
Changes
10
Hide whitespace changes
Inline
Side-by-side
servers/slapd/backover.c
View file @
665f334b
...
...
@@ -1219,6 +1219,7 @@ overlay_remove( BackendDB *be, slap_overinst *on, Operation *op )
rm_cb
->
sc_cleanup
=
overlay_remove_cb
;
rm_cb
->
sc_response
=
NULL
;
rm_cb
->
sc_private
=
(
void
*
)
rm_ctx
;
rm_cb
->
sc_writewait
=
NULL
;
/* Append callback to the end of the list */
if
(
!
op
->
o_callback
)
{
...
...
servers/slapd/overlays/constraint.c
View file @
665f334b
...
...
@@ -601,7 +601,7 @@ constraint_violation( constraint *c, struct berval *bv, Operation *op )
case
CONSTRAINT_URI
:
{
Operation
nop
=
*
op
;
slap_overinst
*
on
=
(
slap_overinst
*
)
op
->
o_bd
->
bd_info
;
slap_callback
cb
;
slap_callback
cb
=
{
0
}
;
int
i
;
int
found
=
0
;
int
rc
;
...
...
@@ -609,9 +609,7 @@ constraint_violation( constraint *c, struct berval *bv, Operation *op )
struct
berval
filterstr
;
char
*
ptr
;
cb
.
sc_next
=
NULL
;
cb
.
sc_response
=
constraint_uri_cb
;
cb
.
sc_cleanup
=
NULL
;
cb
.
sc_private
=
&
found
;
nop
.
o_protocol
=
LDAP_VERSION3
;
...
...
servers/slapd/overlays/dds.c
View file @
665f334b
...
...
@@ -442,6 +442,7 @@ dds_op_add( Operation *op, SlapReply *rs )
sc
->
sc_response
=
dds_counter_cb
;
sc
->
sc_private
=
di
;
sc
->
sc_next
=
op
->
o_callback
;
sc
->
sc_writewait
=
0
;
op
->
o_callback
=
sc
;
}
...
...
@@ -476,6 +477,7 @@ dds_op_delete( Operation *op, SlapReply *rs )
sc
->
sc_cleanup
=
dds_freeit_cb
;
sc
->
sc_response
=
dds_counter_cb
;
sc
->
sc_private
=
di
;
sc
->
sc_writewait
=
0
;
sc
->
sc_next
=
op
->
o_callback
;
op
->
o_callback
=
sc
;
...
...
servers/slapd/overlays/dynlist.c
View file @
665f334b
...
...
@@ -346,7 +346,7 @@ static int
dynlist_prepare_entry
(
Operation
*
op
,
SlapReply
*
rs
,
dynlist_info_t
*
dli
)
{
Attribute
*
a
,
*
id
=
NULL
;
slap_callback
cb
;
slap_callback
cb
=
{
0
}
;
Operation
o
=
*
op
;
struct
berval
*
url
;
Entry
*
e
;
...
...
@@ -404,8 +404,6 @@ dynlist_prepare_entry( Operation *op, SlapReply *rs, dynlist_info_t *dli )
dlc
.
dlc_dli
=
dli
;
cb
.
sc_private
=
&
dlc
;
cb
.
sc_response
=
dynlist_sc_update
;
cb
.
sc_cleanup
=
NULL
;
cb
.
sc_next
=
NULL
;
o
.
o_callback
=
&
cb
;
o
.
ors_deref
=
LDAP_DEREF_NEVER
;
...
...
servers/slapd/overlays/memberof.c
View file @
665f334b
...
...
@@ -737,6 +737,7 @@ memberof_op_add( Operation *op, SlapReply *rs )
sc
->
sc_private
=
sc
+
1
;
sc
->
sc_response
=
memberof_res_add
;
sc
->
sc_cleanup
=
memberof_cleanup
;
sc
->
sc_writewait
=
0
;
mci
=
sc
->
sc_private
;
mci
->
on
=
on
;
mci
->
member
=
NULL
;
...
...
@@ -771,6 +772,7 @@ memberof_op_delete( Operation *op, SlapReply *rs )
sc
->
sc_private
=
sc
+
1
;
sc
->
sc_response
=
memberof_res_delete
;
sc
->
sc_cleanup
=
memberof_cleanup
;
sc
->
sc_writewait
=
0
;
mci
=
sc
->
sc_private
;
mci
->
on
=
on
;
mci
->
member
=
NULL
;
...
...
@@ -1189,6 +1191,7 @@ done2:;
sc
->
sc_private
=
sc
+
1
;
sc
->
sc_response
=
memberof_res_modify
;
sc
->
sc_cleanup
=
memberof_cleanup
;
sc
->
sc_writewait
=
0
;
mci
=
sc
->
sc_private
;
mci
->
on
=
on
;
mci
->
member
=
NULL
;
...
...
@@ -1234,6 +1237,7 @@ memberof_op_modrdn( Operation *op, SlapReply *rs )
sc
->
sc_private
=
sc
+
1
;
sc
->
sc_response
=
memberof_res_modrdn
;
sc
->
sc_cleanup
=
memberof_cleanup
;
sc
->
sc_writewait
=
0
;
mci
=
sc
->
sc_private
;
mci
->
on
=
on
;
mci
->
member
=
NULL
;
...
...
servers/slapd/overlays/pcache.c
View file @
665f334b
...
...
@@ -2841,7 +2841,7 @@ pcache_op_bind(
QueryTemplate
*
temp
;
Entry
*
e
;
slap_callback
cb
=
{
0
},
*
sc
;
bindinfo
bi
;
bindinfo
bi
=
{
0
}
;
bindcacheinfo
*
bci
;
Operation
op2
;
int
rc
;
...
...
@@ -2871,7 +2871,6 @@ pcache_op_bind(
op2
=
*
op
;
op2
.
o_dn
=
op
->
o_bd
->
be_rootdn
;
op2
.
o_ndn
=
op
->
o_bd
->
be_rootndn
;
bi
.
bi_flags
=
0
;
op2
.
o_bd
=
&
cm
->
db
;
e
=
NULL
;
...
...
@@ -2900,11 +2899,8 @@ pcache_op_bind(
*/
bi
.
bi_cm
=
cm
;
bi
.
bi_templ
=
temp
;
bi
.
bi_cq
=
NULL
;
bi
.
bi_si
=
NULL
;
bi
.
bi_cb
.
sc_response
=
pc_bind_search
;
bi
.
bi_cb
.
sc_cleanup
=
NULL
;
bi
.
bi_cb
.
sc_private
=
&
bi
;
cb
.
sc_private
=
&
bi
;
cb
.
sc_response
=
pc_bind_resp
;
...
...
@@ -2940,6 +2936,7 @@ pcache_op_bind(
sc
->
sc_response
=
pc_bind_save
;
sc
->
sc_cleanup
=
NULL
;
sc
->
sc_private
=
sc
+
1
;
sc
->
sc_writewait
=
NULL
;
bci
=
sc
->
sc_private
;
sc
->
sc_next
=
op
->
o_callback
;
op
->
o_callback
=
sc
;
...
...
@@ -3132,6 +3129,7 @@ pcache_op_search(
cb
->
sc_response
=
pcache_response
;
cb
->
sc_cleanup
=
pcache_op_cleanup
;
cb
->
sc_private
=
(
cb
+
1
);
cb
->
sc_writewait
=
0
;
si
=
cb
->
sc_private
;
si
->
on
=
on
;
si
->
query
=
query
;
...
...
servers/slapd/overlays/sssvlv.c
View file @
665f334b
...
...
@@ -923,6 +923,7 @@ static int sssvlv_op_search(
cb
->
sc_response
=
sssvlv_op_response
;
cb
->
sc_next
=
op
->
o_callback
;
cb
->
sc_private
=
so
;
cb
->
sc_writewait
=
NULL
;
so
->
so_tree
=
NULL
;
so
->
so_ctrl
=
sc
;
...
...
servers/slapd/overlays/syncprov.c
View file @
665f334b
...
...
@@ -2501,7 +2501,7 @@ syncprov_op_search( Operation *op, SlapReply *rs )
syncops
so
=
{
0
};
fbase_cookie
fc
;
opcookie
opc
;
slap_callback
sc
;
slap_callback
sc
=
{
0
}
;
fc
.
fss
=
&
so
;
fc
.
fbase
=
0
;
...
...
servers/slapd/slapi/slapi_overlay.c
View file @
665f334b
...
...
@@ -82,6 +82,7 @@ slapi_op_internal_p( Operation *op, SlapReply *rs, slap_callback *cb )
cb
->
sc_response
=
slapi_over_response
;
cb
->
sc_cleanup
=
slapi_over_cleanup
;
cb
->
sc_private
=
pb
;
cb
->
sc_writewait
=
0
;
cb
->
sc_next
=
op
->
o_callback
;
op
->
o_callback
=
cb
;
}
...
...
@@ -734,6 +735,7 @@ slapi_over_access_allowed(
cb
.
sc_response
=
NULL
;
cb
.
sc_cleanup
=
NULL
;
cb
.
sc_writewait
=
NULL
;
pb
=
SLAPI_OPERATION_PBLOCK
(
op
);
...
...
@@ -798,6 +800,7 @@ slapi_over_acl_group(
cb
.
sc_response
=
NULL
;
cb
.
sc_cleanup
=
NULL
;
cb
.
sc_writewait
=
NULL
;
pb
=
SLAPI_OPERATION_PBLOCK
(
op
);
...
...
servers/slapd/syncrepl.c
View file @
665f334b
...
...
@@ -2219,6 +2219,7 @@ syncrepl_op_modify( Operation *op, SlapReply *rs )
sc
->
sc_private
=
mx
;
sc
->
sc_next
=
op
->
o_callback
;
sc
->
sc_cleanup
=
NULL
;
sc
->
sc_writewait
=
NULL
;
op
->
o_callback
=
sc
;
op
->
orm_no_opattrs
=
1
;
mx
->
mx_orig
=
op
->
orm_modlist
;
...
...
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