summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-11-03 16:24:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:45:43 -0500
commit536e68dbee1fcb404230b0fd6a9a050b7e4e9ee8 (patch)
tree4627d1c440bfbb76edfcf89563de37eac2811745
parentb69e508381a20304b7809a975830696e1a652a7b (diff)
downloadsamba-536e68dbee1fcb404230b0fd6a9a050b7e4e9ee8.tar.gz
samba-536e68dbee1fcb404230b0fd6a9a050b7e4e9ee8.tar.bz2
samba-536e68dbee1fcb404230b0fd6a9a050b7e4e9ee8.zip
r11485: prevent us from calling the request handler recursiv when
the handler calls talloc_free(wrepl_socket) metze (This used to be commit bf0b96f057c7f4ac39409c8710ec0cfb55d9fb04)
-rw-r--r--source4/libcli/wrepl/winsrepl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c
index 61cf633b54..bf894c6ad0 100644
--- a/source4/libcli/wrepl/winsrepl.c
+++ b/source4/libcli/wrepl/winsrepl.c
@@ -500,6 +500,9 @@ static void wrepl_request_trigger_handler(struct event_context *ev, struct timed
struct timeval t, void *ptr)
{
struct wrepl_request *req = talloc_get_type(ptr, struct wrepl_request);
+ struct wrepl_socket *wrepl_socket = req->wrepl_socket;
+ DLIST_REMOVE(wrepl_socket->send_queue, req);
+ DLIST_REMOVE(wrepl_socket->recv_queue, req);
if (req->async.fn) {
req->async.fn(req);
}