diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-06-19 09:31:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:30 -0500 |
| commit | c7496c6cdb7bdcdd483868c21457350f567ec054 (patch) | |
| tree | 5584e0aaf51f9504bc5754d79a147b39af766de2 /source4/ldap_server/ldap_simple_ldb.c | |
| parent | 68853a1c7be11ffaaef4ad2e3f78a97f0b401b68 (diff) | |
| download | samba-c7496c6cdb7bdcdd483868c21457350f567ec054.tar.gz samba-c7496c6cdb7bdcdd483868c21457350f567ec054.tar.bz2 samba-c7496c6cdb7bdcdd483868c21457350f567ec054.zip | |
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)
Diffstat (limited to 'source4/ldap_server/ldap_simple_ldb.c')
| -rw-r--r-- | source4/ldap_server/ldap_simple_ldb.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/source4/ldap_server/ldap_simple_ldb.c b/source4/ldap_server/ldap_simple_ldb.c index 898b5fd82a..4b73026d42 100644 --- a/source4/ldap_server/ldap_simple_ldb.c +++ b/source4/ldap_server/ldap_simple_ldb.c @@ -38,7 +38,6 @@ static NTSTATUS sldb_Search(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_SearchRequest *r) { - NTSTATUS status; void *local_ctx; struct ldap_dn *basedn; struct ldap_Result *done; @@ -128,10 +127,7 @@ static NTSTATUS sldb_Search(struct ldapsrv_partition *partition, struct ldapsrv_ } } queue_reply: - status = ldapsrv_queue_reply(call, ent_r); - if (!NT_STATUS_IS_OK(status)) { - return status; - } + ldapsrv_queue_reply(call, ent_r); } reply: @@ -162,7 +158,8 @@ reply: talloc_free(local_ctx); - return ldapsrv_queue_reply(call, done_r); + ldapsrv_queue_reply(call, done_r); + return NT_STATUS_OK; } static NTSTATUS sldb_Add(struct ldapsrv_partition *partition, struct ldapsrv_call *call, @@ -261,7 +258,8 @@ reply: talloc_free(local_ctx); - return ldapsrv_queue_reply(call, add_reply); + ldapsrv_queue_reply(call, add_reply); + return NT_STATUS_OK; } static NTSTATUS sldb_Del(struct ldapsrv_partition *partition, struct ldapsrv_call *call, @@ -313,7 +311,8 @@ reply: talloc_free(local_ctx); - return ldapsrv_queue_reply(call, del_reply); + ldapsrv_queue_reply(call, del_reply); + return NT_STATUS_OK; } static NTSTATUS sldb_Modify(struct ldapsrv_partition *partition, struct ldapsrv_call *call, @@ -423,7 +422,8 @@ reply: talloc_free(local_ctx); - return ldapsrv_queue_reply(call, modify_reply); + ldapsrv_queue_reply(call, modify_reply); + return NT_STATUS_OK; } static NTSTATUS sldb_Compare(struct ldapsrv_partition *partition, struct ldapsrv_call *call, @@ -492,7 +492,8 @@ reply: talloc_free(local_ctx); - return ldapsrv_queue_reply(call, compare_r); + ldapsrv_queue_reply(call, compare_r); + return NT_STATUS_OK; } static NTSTATUS sldb_ModifyDN(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_ModifyDNRequest *r) @@ -589,7 +590,8 @@ reply: talloc_free(local_ctx); - return ldapsrv_queue_reply(call, modifydn_r); + ldapsrv_queue_reply(call, modifydn_r); + return NT_STATUS_OK; } static const struct ldapsrv_partition_ops sldb_ops = { |