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
faef608a
Commit
faef608a
authored
May 19, 2015
by
Howard Chu
Committed by
Quanah Gibson-Mount
May 27, 2015
Browse files
ITS#8142 drop client connection on remote failure
also cleanup of return-code handling
parent
01e71f21
Changes
5
Hide whitespace changes
Inline
Side-by-side
servers/slapd/back-ldap/bind.c
View file @
faef608a
...
...
@@ -1575,6 +1575,7 @@ retry:;
op
->
o_tag
=
o_tag
;
rs
->
sr_text
=
"Proxy can't contact remote server"
;
send_ldap_result
(
op
,
rs
);
rs
->
sr_err
=
SLAPD_DISCONNECT
;
}
rc
=
0
;
...
...
servers/slapd/back-ldap/delete.c
View file @
faef608a
...
...
@@ -53,7 +53,6 @@ retry:
rc
=
ldap_back_controls_add
(
op
,
rs
,
lc
,
&
ctrls
);
if
(
rc
!=
LDAP_SUCCESS
)
{
send_ldap_result
(
op
,
rs
);
rc
=
rs
->
sr_err
;
goto
cleanup
;
}
...
...
@@ -82,5 +81,5 @@ cleanup:
ldap_back_release_conn
(
li
,
lc
);
}
return
r
c
;
return
r
s
->
sr_err
;
}
servers/slapd/back-ldap/modify.c
View file @
faef608a
...
...
@@ -98,7 +98,6 @@ retry:;
rc
=
ldap_back_controls_add
(
op
,
rs
,
lc
,
&
ctrls
);
if
(
rc
!=
LDAP_SUCCESS
)
{
send_ldap_result
(
op
,
rs
);
rc
=
-
1
;
goto
cleanup
;
}
...
...
@@ -132,6 +131,6 @@ cleanup:;
ldap_back_release_conn
(
li
,
lc
);
}
return
r
c
;
return
r
s
->
sr_err
;
}
servers/slapd/back-ldap/modrdn.c
View file @
faef608a
...
...
@@ -85,7 +85,6 @@ retry:
rc
=
ldap_back_controls_add
(
op
,
rs
,
lc
,
&
ctrls
);
if
(
rc
!=
LDAP_SUCCESS
)
{
send_ldap_result
(
op
,
rs
);
rc
=
-
1
;
goto
cleanup
;
}
...
...
@@ -119,6 +118,6 @@ cleanup:
ldap_back_release_conn
(
li
,
lc
);
}
return
r
c
;
return
r
s
->
sr_err
;
}
servers/slapd/back-ldap/search.c
View file @
faef608a
...
...
@@ -645,6 +645,8 @@ finish:;
ldap_back_release_conn
(
li
,
lc
);
}
if
(
rs
->
sr_err
==
LDAP_UNAVAILABLE
)
rs
->
sr_err
=
SLAPD_DISCONNECT
;
return
rs
->
sr_err
;
}
...
...
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