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
cb3137d7
Commit
cb3137d7
authored
May 17, 2006
by
Kurt Zeilenga
Browse files
Misc changes from HEAD
parent
0d0ae8a8
Changes
3
Hide whitespace changes
Inline
Side-by-side
servers/slapd/back-meta/bind.c
View file @
cb3137d7
...
...
@@ -636,13 +636,21 @@ retry:;
done:
;
rs
->
sr_err
=
rc
;
if
(
rc
!=
LDAP_SUCCESS
&&
META_BACK_ONERR_STOP
(
mi
)
)
{
if
(
rc
!=
LDAP_SUCCESS
)
{
if
(
dolock
)
{
ldap_pvt_thread_mutex_lock
(
&
mi
->
mi_conninfo
.
lai_mutex
);
}
LDAP_BACK_CONN_BINDING_CLEAR
(
msc
);
LDAP_BACK_CONN_TAINTED_SET
(
mc
);
meta_back_release_conn_lock
(
op
,
mc
,
dolock
);
*
mcp
=
NULL
;
if
(
META_BACK_ONERR_STOP
(
mi
)
)
{
LDAP_BACK_CONN_TAINTED_SET
(
mc
);
meta_back_release_conn_lock
(
op
,
mc
,
dolock
);
*
mcp
=
NULL
;
}
if
(
dolock
)
{
ldap_pvt_thread_mutex_unlock
(
&
mi
->
mi_conninfo
.
lai_mutex
);
}
if
(
sendok
&
LDAP_BACK_SENDERR
)
{
if
(
META_BACK_ONERR_STOP
(
mi
)
&&
(
sendok
&
LDAP_BACK_SENDERR
)
)
{
send_ldap_result
(
op
,
rs
);
}
}
...
...
servers/slapd/slapi/slapi_overlay.c
View file @
cb3137d7
...
...
@@ -97,12 +97,14 @@ slapi_over_compute_output(
{
Attribute
**
a
;
AttributeDescription
*
desc
;
SlapReply
*
rs
=
(
SlapReply
*
)
c
->
cac_private
;
SlapReply
*
rs
;
if
(
c
==
NULL
||
attribute
==
NULL
||
entry
==
NULL
)
{
return
0
;
}
rs
=
(
SlapReply
*
)
c
->
cac_private
;
assert
(
rs
->
sr_entry
==
entry
);
desc
=
attribute
->
a_desc
;
...
...
servers/slapd/slapi/slapi_pblock.c
View file @
cb3137d7
...
...
@@ -624,7 +624,7 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
break
;
case
SLAPI_MODIFY_MODS
:
{
LDAPMod
**
mods
=
NULL
;
Modifications
*
ml
;
Modifications
*
ml
=
NULL
;
pblock_get_default
(
pb
,
param
,
(
void
**
)
&
mods
);
if
(
mods
==
NULL
&&
pb
->
pb_intop
==
0
)
{
...
...
@@ -635,12 +635,14 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
case
LDAP_REQ_MODRDN
:
ml
=
pb
->
pb_op
->
orr_modlist
;
break
;
defaul
a
t:
default:
rc
=
PBLOCK_ERROR
;
break
;
}
mods
=
slapi_int_modifications2ldapmods
(
ml
);
pblock_set_default
(
pb
,
param
,
(
void
*
)
mods
);
if
(
rc
!=
PBLOCK_ERROR
)
{
mods
=
slapi_int_modifications2ldapmods
(
ml
);
pblock_set_default
(
pb
,
param
,
(
void
*
)
mods
);
}
}
*
((
LDAPMod
***
)
value
)
=
mods
;
break
;
...
...
Write
Preview
Markdown
is supported
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