Remove the horror that was the global smb_rw_error.

Each cli struct has it's own local copy of this variable,
so use that in client code. In the smbd server, add one
static to smbd/proccess.c and use that inside smbd. Fix
a bunch of places where smb_rw_error could be set by
calling read_data() in places where we weren't reading
from the SMB client socket (ie. winbindd).
Jeremy.
(This used to be commit 255c2adf7b6ef30932b5bb9f142ccef4a5d3d0db)

3 files changed, 42 insertions, 24 deletions

diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index fb6e6c0f09..d89442150f 100644
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -256,7 +256,7 @@ static int expect(int master, char *issue, char *expected)
 
 		while ((len = read_socket_with_timeout(master, buffer + nread, 1,
 						       sizeof(buffer) - nread - 1,
-						       timeout)) > 0) {
+						       timeout, NULL)) > 0) {
 			nread += len;
 			buffer[nread] = 0;
 
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 7d6455621f..24497de69a 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -24,6 +24,7 @@ extern struct auth_context *negprot_global_auth_context;
 extern int smb_echo_count;
 
 const int total_buffer_size = (BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE + SAFETY_MARGIN);
+static enum smb_read_errors smb_read_error = SMB_READ_OK;
 
 /*
  * Size of data we can send to client. Set
@@ -43,6 +44,13 @@ SIG_ATOMIC_T got_sig_term = 0;
 extern bool global_machine_password_needs_changing;
 extern int max_send;
 
+/* Accessor function for smb_read_error for smbd functions. */
+
+enum smb_read_errors *get_srv_read_error(void)
+{
+	return &smb_read_error;
+}
+
 /* Socket functions for smbd packet processing. */
 
 static bool valid_packet_size(size_t len)
@@ -63,7 +71,8 @@ static bool valid_packet_size(size_t len)
 			 * variables still suck :-). JRA.
 			 */
 
-			cond_set_smb_read_error(SMB_READ_ERROR);
+			cond_set_smb_read_error(get_srv_read_error(),
+						SMB_READ_ERROR);
 			return false;
 		}
 	}
@@ -86,13 +95,15 @@ static ssize_t read_packet_remainder(int fd,
 						buffer,
 						len,
 						len,
-						timeout);
+						timeout,
+						get_srv_read_error());
 	} else {
-		ret = read_data(fd, buffer, len);
+		ret = read_data(fd, buffer, len, get_srv_read_error());
 	}
 
 	if (ret != len) {
-		cond_set_smb_read_error(SMB_READ_ERROR);
+		cond_set_smb_read_error(get_srv_read_error(),
+					SMB_READ_ERROR);
 		return -1;
 	}
 
@@ -135,15 +146,18 @@ ssize_t receive_smb_raw_talloc_partial_read(TALLOC_CTX *mem_ctx,
 					writeX_header + 4,
 					STANDARD_WRITE_AND_X_HEADER_SIZE,
 					STANDARD_WRITE_AND_X_HEADER_SIZE,
-					timeout);
+					timeout,
+					get_srv_read_error());
 	} else {
 		ret = read_data(fd,
 				writeX_header+4,
-				STANDARD_WRITE_AND_X_HEADER_SIZE);
+				STANDARD_WRITE_AND_X_HEADER_SIZE,
+				get_srv_read_error());
 	}
 
 	if (ret != STANDARD_WRITE_AND_X_HEADER_SIZE) {
-		cond_set_smb_read_error(SMB_READ_ERROR);
+		cond_set_smb_read_error(get_srv_read_error(),
+					SMB_READ_ERROR);
 		return -1;
 	}
 
@@ -183,7 +197,8 @@ ssize_t receive_smb_raw_talloc_partial_read(TALLOC_CTX *mem_ctx,
 		if (*buffer == NULL) {
 			DEBUG(0, ("Could not allocate inbuf of length %d\n",
 				  (int)sizeof(writeX_header)));
-			cond_set_smb_read_error(SMB_READ_ERROR);
+			cond_set_smb_read_error(get_srv_read_error(),
+						SMB_READ_ERROR);
 			return -1;
 		}
 
@@ -207,7 +222,8 @@ ssize_t receive_smb_raw_talloc_partial_read(TALLOC_CTX *mem_ctx,
 	if (*buffer == NULL) {
 		DEBUG(0, ("Could not allocate inbuf of length %d\n",
 			  (int)len+4));
-		cond_set_smb_read_error(SMB_READ_ERROR);
+		cond_set_smb_read_error(get_srv_read_error(),
+					SMB_READ_ERROR);
 		return -1;
 	}
 
@@ -240,10 +256,11 @@ static ssize_t receive_smb_raw_talloc(TALLOC_CTX *mem_ctx,
 	ssize_t len,ret;
 	int min_recv_size = lp_min_receive_file_size();
 
-	set_smb_read_error(SMB_READ_OK);
+	set_smb_read_error(get_srv_read_error(),SMB_READ_OK);
 	*p_unread = 0;
 
-	len = read_smb_length_return_keepalive(fd, lenbuf, timeout);
+	len = read_smb_length_return_keepalive(fd, lenbuf,
+			timeout, get_srv_read_error());
 	if (len < 0) {
 		DEBUG(10,("receive_smb_raw: length < 0!\n"));
 
@@ -253,7 +270,7 @@ static ssize_t receive_smb_raw_talloc(TALLOC_CTX *mem_ctx,
 		 * variables still suck :-). JRA.
 		 */
 
-		cond_set_smb_read_error(SMB_READ_ERROR);
+		cond_set_smb_read_error(get_srv_read_error(),SMB_READ_ERROR);
 		return -1;
 	}
 
@@ -283,7 +300,7 @@ static ssize_t receive_smb_raw_talloc(TALLOC_CTX *mem_ctx,
 	if (*buffer == NULL) {
 		DEBUG(0, ("Could not allocate inbuf of length %d\n",
 			  (int)len+4));
-		cond_set_smb_read_error(SMB_READ_ERROR);
+		cond_set_smb_read_error(get_srv_read_error(),SMB_READ_ERROR);
 		return -1;
 	}
 
@@ -312,7 +329,7 @@ ssize_t receive_smb_talloc(TALLOC_CTX *mem_ctx, int fd, char **buffer,
 	if (!srv_check_sign_mac(*buffer, true)) {
 		DEBUG(0, ("receive_smb: SMB Signature verification failed on "
 			  "incoming packet!\n"));
-		cond_set_smb_read_error(SMB_READ_BAD_SIG);
+		cond_set_smb_read_error(get_srv_read_error(),SMB_READ_BAD_SIG);
 		return -1;
 	}
 
@@ -682,7 +699,7 @@ static bool receive_message_or_smb(TALLOC_CTX *mem_ctx,
 	ssize_t len;
 
 	*p_unread = 0;
-	set_smb_read_error(SMB_READ_OK);
+	set_smb_read_error(get_srv_read_error(),SMB_READ_OK);
 
  again:
 
@@ -736,7 +753,7 @@ static bool receive_message_or_smb(TALLOC_CTX *mem_ctx,
 							msg->buf.length);
 			if (*buffer == NULL) {
 				DEBUG(0, ("talloc failed\n"));
-				set_smb_read_error(SMB_READ_ERROR);
+				set_smb_read_error(get_srv_read_error(),SMB_READ_ERROR);
 				return False;
 			}
 			*buffer_len = msg->buf.length;
@@ -830,13 +847,13 @@ static bool receive_message_or_smb(TALLOC_CTX *mem_ctx,
 	/* Check if error */
 	if (selrtn == -1) {
 		/* something is wrong. Maybe the socket is dead? */
-		set_smb_read_error(SMB_READ_ERROR);
+		set_smb_read_error(get_srv_read_error(),SMB_READ_ERROR);
 		return False;
 	} 
     
 	/* Did we timeout ? */
 	if (selrtn == 0) {
-		set_smb_read_error(SMB_READ_TIMEOUT);
+		set_smb_read_error(get_srv_read_error(),SMB_READ_TIMEOUT);
 		return False;
 	}
 
@@ -1826,18 +1843,18 @@ static bool timeout_processing(int *select_timeout,
 {
 	time_t t;
 
-	if (get_smb_read_error() == SMB_READ_EOF) {
+	if (*get_srv_read_error() == SMB_READ_EOF) {
 		DEBUG(3,("timeout_processing: End of file from client (client has disconnected).\n"));
 		return false;
 	}
 
-	if (get_smb_read_error() == SMB_READ_ERROR) {
+	if (*get_srv_read_error() == SMB_READ_ERROR) {
 		DEBUG(3,("timeout_processing: receive_smb error (%s) Exiting\n",
 			strerror(errno)));
 		return false;
 	}
 
-	if (get_smb_read_error() == SMB_READ_BAD_SIG) {
+	if (*get_srv_read_error() == SMB_READ_BAD_SIG) {
 		DEBUG(3,("timeout_processing: receive_smb error bad smb signature. Exiting\n"));
 		return false;
 	}
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index a7fa67df22..1b36fb1e44 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3535,7 +3535,8 @@ void reply_writebraw(connection_struct *conn, struct smb_request *req)
 	}
 
 	/* Now read the raw data into the buffer and write it */
-	if (read_smb_length(smbd_server_fd(),buf,SMB_SECONDARY_WAIT) == -1) {
+	if (read_smb_length(smbd_server_fd(),buf,
+			SMB_SECONDARY_WAIT, get_srv_read_error()) == -1) {
 		exit_server_cleanly("secondary writebraw failed");
 	}
 
@@ -3564,7 +3565,7 @@ void reply_writebraw(connection_struct *conn, struct smb_request *req)
 				(int)tcount,(int)nwritten,(int)numtowrite));
 		}
 
-		if (read_data(smbd_server_fd(), buf+4, numtowrite)
+		if (read_data(smbd_server_fd(), buf+4, numtowrite,get_srv_read_error())
 					!= numtowrite ) {
 			DEBUG(0,("reply_writebraw: Oversize secondary write "
 				"raw read failed (%s). Terminating\n",