summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2006-04-26 16:52:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:02 -0500
commit886329898c3e6184642a6e454fd10802c388dc7e (patch)
treede4adb228439a72049f60d98391ca294921fbfa3 /source4/libcli
parente28c03aeecef54fb0488c868a86177994788969e (diff)
downloadsamba-886329898c3e6184642a6e454fd10802c388dc7e.tar.gz
samba-886329898c3e6184642a6e454fd10802c388dc7e.tar.bz2
samba-886329898c3e6184642a6e454fd10802c388dc7e.zip
r15288: fix some problems
(This used to be commit d448389be88b3bb9d6f9a3b8a1e1597c4988a0ff)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/ldap/ldap_client.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 74ac64a68d..27cab38916 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -88,7 +88,7 @@ static void ldap_connection_dead(struct ldap_connection *conn)
}
talloc_free(conn->tls);
- talloc_free(conn->sock); /* this will also free event.fde */
+/* talloc_free(conn->sock); this will also free event.fde */
talloc_free(conn->packet);
conn->tls = NULL;
conn->sock = NULL;
@@ -621,7 +621,7 @@ failed:
*/
NTSTATUS ldap_request_wait(struct ldap_request *req)
{
- while (req->state <= LDAP_REQUEST_DONE) {
+ while (req->state < LDAP_REQUEST_DONE) {
if (event_loop_once(req->conn->event.event_ctx) != 0) {
req->status = NT_STATUS_UNEXPECTED_NETWORK_ERROR;
break;
@@ -734,7 +734,7 @@ NTSTATUS ldap_result_n(struct ldap_request *req, int n, struct ldap_message **ms
NT_STATUS_HAVE_NO_MEMORY(req);
- while (req->state <= LDAP_REQUEST_DONE && n >= req->num_replies) {
+ while (req->state < LDAP_REQUEST_DONE && n >= req->num_replies) {
if (event_loop_once(req->conn->event.event_ctx) != 0) {
return NT_STATUS_UNEXPECTED_NETWORK_ERROR;
}