[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1705-g8cd9c72

[Stefan Metzmacher]

The branch, master has been updated
       via  8cd9c72d75aeb92d64e2781081fed8847727d289 (commit)
       via  ac7f4fa380722e9e8c71f24c32475e3c0d3e1e90 (commit)
      from  e3b5e286d062fe2e82ea0ac4820bd036f3882db9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8cd9c72d75aeb92d64e2781081fed8847727d289
Author: Sam Liddicott <sam at liddicott.com>
Date:   Tue May 19 15:42:39 2009 +0100

    s4:smb_server: initialy read the first 4 bytes only
    
    Stop packet_recv getting greedy and reading the whole socket
    and then dispatching te extra packets in a timer loop
    
    Signed-off-by: Sam Liddicott <sam at liddicott.com>
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit ac7f4fa380722e9e8c71f24c32475e3c0d3e1e90
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue May 19 16:18:38 2009 +0200

    s4:libcli/raw: initialy read the first 4 bytes only
    
    metze

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

Summary of changes:
 source4/libcli/raw/clitransport.c |    1 +
 source4/smb_server/smb_server.c   |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index 5cf0272..0ced607 100644
--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@@ -106,6 +106,7 @@ struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock,
 	packet_set_error_handler(transport->packet, smbcli_transport_error);
 	packet_set_event_context(transport->packet, transport->socket->event.ctx);
 	packet_set_nofree(transport->packet);
+	packet_set_initial_read(transport->packet, 4);
 
 	smbcli_init_signing(transport);
 
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index 6206a03..2811693 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -145,6 +145,7 @@ static void smbsrv_accept(struct stream_connection *conn)
 	packet_set_event_context(smb_conn->packet, conn->event.ctx);
 	packet_set_fde(smb_conn->packet, conn->event.fde);
 	packet_set_serialise(smb_conn->packet);
+	packet_set_initial_read(smb_conn->packet, 4);
 
 	smb_conn->lp_ctx = conn->lp_ctx;
 	smb_conn->connection = conn;


-- 
Samba Shared Repository