[SCM] Samba Shared Repository - branch v3-5-test updated - release-4-0-0alpha8-1398-g8d99967

[Jeremy Allison]

The branch, v3-5-test has been updated
       via  8d999676f7f5adf4e8a0b3ae1c2f52a68aa1a65c (commit)
      from  237007230013219f7281241af4a21a911f27f2a4 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 8d999676f7f5adf4e8a0b3ae1c2f52a68aa1a65c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Sep 8 22:07:30 2009 +0200

    socket_wrapper: swrap_read() should use SWRAP_RECV* for swrap_dump_packet()
    
    This is the same as swrap_recv().
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 lib/socket_wrapper/socket_wrapper.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c
index eb53c9c..a188cc6 100644
--- a/lib/socket_wrapper/socket_wrapper.c
+++ b/lib/socket_wrapper/socket_wrapper.c
@@ -671,8 +671,6 @@ enum swrap_packet_type {
 	SWRAP_CLOSE_SEND,
 	SWRAP_CLOSE_RECV,
 	SWRAP_CLOSE_ACK,
-	SWRAP_READ,
-	SWRAP_READ_RST
 };
 
 struct swrap_file_hdr {
@@ -2060,11 +2058,11 @@ _PUBLIC_ ssize_t swrap_read(int s, void *buf, size_t len)
 
 	ret = real_read(s, buf, len);
 	if (ret == -1 && errno != EAGAIN && errno != ENOBUFS) {
-		swrap_dump_packet(si, NULL, SWRAP_READ_RST, NULL, 0);
+		swrap_dump_packet(si, NULL, SWRAP_RECV_RST, NULL, 0);
 	} else if (ret == 0) { /* END OF FILE */
-		swrap_dump_packet(si, NULL, SWRAP_READ_RST, NULL, 0);
+		swrap_dump_packet(si, NULL, SWRAP_RECV_RST, NULL, 0);
 	} else if (ret > 0) {
-		swrap_dump_packet(si, NULL, SWRAP_READ, buf, ret);
+		swrap_dump_packet(si, NULL, SWRAP_RECV, buf, ret);
 	}
 
 	return ret;


-- 
Samba Shared Repository