diff options
author | Andrew Tridgell <tridge@samba.org> | 2009-03-20 10:01:17 +1100 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2009-03-20 10:01:17 +1100 |
commit | 9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3 (patch) | |
tree | 94bd92a2eec2f966577ebba35468530b1f315aba /source4/cldap_server/rootdse.c | |
parent | 844a1b3cd27f323087b707e494c5e3860340eb27 (diff) | |
parent | 3a4638db0351368d3b148bf547546f28fa0b1479 (diff) | |
download | samba-9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3.tar.gz samba-9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3.tar.bz2 samba-9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/cldap_server/rootdse.c')
-rw-r--r-- | source4/cldap_server/rootdse.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/source4/cldap_server/rootdse.c b/source4/cldap_server/rootdse.c index daa5060d07..7e867deff2 100644 --- a/source4/cldap_server/rootdse.c +++ b/source4/cldap_server/rootdse.c @@ -20,19 +20,15 @@ */ #include "includes.h" +#include <tevent.h> #include "libcli/ldap/ldap.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" -#include "lib/events/events.h" -#include "lib/socket/socket.h" #include "smbd/service_task.h" #include "cldap_server/cldap_server.h" #include "librpc/gen_ndr/ndr_misc.h" #include "dsdb/samdb/samdb.h" -#include "auth/auth.h" #include "ldb_wrap.h" -#include "system/network.h" -#include "lib/socket/netif.h" static void cldapd_rootdse_fill(struct cldapd_server *cldapd, TALLOC_CTX *mem_ctx, @@ -151,15 +147,15 @@ done: handle incoming cldap requests */ void cldapd_rootdse_request(struct cldap_socket *cldap, + struct cldapd_server *cldapd, + TALLOC_CTX *tmp_ctx, uint32_t message_id, struct ldap_SearchRequest *search, - struct socket_address *src) + struct tsocket_address *src) { - struct cldapd_server *cldapd = talloc_get_type(cldap->incoming.private_data, struct cldapd_server); NTSTATUS status; struct cldap_reply reply; struct ldap_Result result; - TALLOC_CTX *tmp_ctx = talloc_new(cldap); ZERO_STRUCT(result); @@ -176,6 +172,5 @@ void cldapd_rootdse_request(struct cldap_socket *cldap, ldb_filter_from_tree(tmp_ctx, search->tree), nt_errstr(status))); } - talloc_free(tmp_ctx); return; } |