From b6b767a2c47b26c1758520212b4f09ddb934c9f3 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 7 Sep 2011 18:55:02 +0200
Subject: s3:smb2cli: only use tevent_req_defer_callback() if we have more than
 one smb2 response

metze
---
 source3/libsmb/smb2cli_base.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/source3/libsmb/smb2cli_base.c b/source3/libsmb/smb2cli_base.c
index 869c223b82..d26e1b4a25 100644
--- a/source3/libsmb/smb2cli_base.c
+++ b/source3/libsmb/smb2cli_base.c
@@ -515,6 +515,7 @@ static void smb2cli_inbuf_received(struct tevent_req *subreq)
 	ssize_t received;
 	int err;
 	size_t num_pending;
+	bool defer = true;
 
 	received = read_smb_recv(subreq, frame, &inbuf, &err);
 	TALLOC_FREE(subreq);
@@ -602,7 +603,13 @@ static void smb2cli_inbuf_received(struct tevent_req *subreq)
 		 * There might be more than one response
 		 * we need to defer the notifications
 		 */
-		tevent_req_defer_callback(req, state->ev);
+		if ((num_iov == 4) && (talloc_array_length(cli->conn.pending) == 0)) {
+			defer = false;
+		}
+
+		if (defer) {
+			tevent_req_defer_callback(req, state->ev);
+		}
 
 		/*
 		 * Note: here we use talloc_reference() in a way
@@ -623,6 +630,10 @@ static void smb2cli_inbuf_received(struct tevent_req *subreq)
 
 	TALLOC_FREE(frame);
 
+	if (!defer) {
+		return;
+	}
+
 	num_pending = talloc_array_length(cli->conn.pending);
 	if (num_pending == 0) {
 		if (state->cli->smb2.mid < UINT64_MAX) {
-- 
cgit