From: Jeremy Allison <jra@samba.org>
Date: Mon, 31 Mar 2008 23:56:21 +0000 (-0700)
Subject: Move the message_dispatch() call after the check for errno on
X-Git-Tag: samba-3.3.0pre1~2976
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26a74d01bb2b53ffa5d296ff1c7d8b2b0d17831a;p=thirdparty%2Fsamba.git

Move the message_dispatch() call after the check for errno on
the select return. We don't want the call to message_dispatch
to mess up the errno value.
Jeremy.
---

diff --git a/source/smbd/process.c b/source/smbd/process.c
index 03216a07001..9aa775d0f67 100644
--- a/source/smbd/process.c
+++ b/source/smbd/process.c
@@ -853,15 +853,6 @@ static NTSTATUS receive_message_or_smb(TALLOC_CTX *mem_ctx, char **buffer,
 		goto again;
 	}
 
-	/*
-	 * We've just woken up from a protentially long select sleep.
-	 * Ensure we process local messages as we need to synchronously
-	 * process any messages from other smbd's to avoid file rename race
-	 * conditions. This call is cheap if there are no messages waiting.
-	 * JRA.
-	 */
-	message_dispatch(smbd_messaging_context());
-
 	/* if we get EINTR then maybe we have received an oplock
 	   signal - treat this as select returning 1. This is ugly, but
 	   is the best we can do until the oplock code knows more about
@@ -880,8 +871,17 @@ static NTSTATUS receive_message_or_smb(TALLOC_CTX *mem_ctx, char **buffer,
 	if (selrtn == -1) {
 		/* something is wrong. Maybe the socket is dead? */
 		return map_nt_error_from_unix(errno);
-	} 
-    
+	}
+
+	/*
+	 * We've just woken up from a protentially long select sleep.
+	 * Ensure we process local messages as we need to synchronously
+	 * process any messages from other smbd's to avoid file rename race
+	 * conditions. This call is cheap if there are no messages waiting.
+	 * JRA.
+	 */
+	message_dispatch(smbd_messaging_context());
+
 	/* Did we timeout ? */
 	if (selrtn == 0) {
 		return NT_STATUS_IO_TIMEOUT;