From c7496c6cdb7bdcdd483868c21457350f567ec054 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 19 Jun 2005 09:31:34 +0000 Subject: r7747: - simplified the ldap server buffer handling - got rid of the special cases for sasl buffers - added a tls_socket_pending() call to determine how much data is waiting on a tls connection - removed the attempt at async handling of ldap calls. The buffers/sockets are all async, but the calls themselves are sync. (This used to be commit 73cb4aad229d08e17e22d5792580bd43a61b142a) --- source4/ldap_server/ldap_rootdse.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'source4/ldap_server/ldap_rootdse.c') diff --git a/source4/ldap_server/ldap_rootdse.c b/source4/ldap_server/ldap_rootdse.c index e5c74be78d..9d19f71fcb 100644 --- a/source4/ldap_server/ldap_rootdse.c +++ b/source4/ldap_server/ldap_rootdse.c @@ -322,10 +322,7 @@ static NTSTATUS rootdse_Search(struct ldapsrv_partition *partition, struct ldaps } } queue_reply: - status = ldapsrv_queue_reply(call, ent_r); - if (!NT_STATUS_IS_OK(status)) { - return status; - } + ldapsrv_queue_reply(call, ent_r); } done_r = ldapsrv_init_reply(call, LDAP_TAG_SearchResultDone); @@ -357,7 +354,8 @@ queue_reply: talloc_free(local_ctx); - return ldapsrv_queue_reply(call, done_r); + ldapsrv_queue_reply(call, done_r); + return NT_STATUS_OK; } static const struct ldapsrv_partition_ops rootdse_ops = { -- cgit