[SCM] Samba Shared Repository - branch v3-4-stable updated - release-3-4-0-100-g2e90008

[Karolin Seeger]

The branch, v3-4-stable has been updated
       via  2e900086e86da37ff49978537ef67d5b9fad9a2e (commit)
      from  74ec7766bf036b0acbf80e8030dec8427ee6a71d (commit)

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


- Log -----------------------------------------------------------------
commit 2e900086e86da37ff49978537ef67d5b9fad9a2e
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Sep 9 12:24:08 2009 +0200

    s3:libsmb: Correctly chew keepalive packets
    
    Thanks a *lot* to Günther to send me the relevant traces!
    
    Volker
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    
    Fixes bug #6646 (Winbind authentication issue on 3.2.13/14 and 3.4.0 (was:
    [Samba] Crazied NTLM_AUTH on samba 3.4.0)).
    (cherry picked from commit a4f9583ce364fad963cc154f0229cb57ec0043d2)

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

Summary of changes:
 source3/libsmb/async_smb.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 066ac7b..07d832e 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -923,6 +923,12 @@ static void handle_incoming_pdu(struct cli_state *cli)
 		}
 	}
 
+	if ((raw_pdu_len == 4) && (CVAL(pdu, 0) == SMBkeepalive)) {
+		DEBUG(10, ("Got keepalive\n"));
+		TALLOC_FREE(pdu);
+		return;
+	}
+
 	status = validate_smb_crypto(cli, pdu);
 	if (!NT_STATUS_IS_OK(status)) {
 		goto invalidate_requests;


-- 
Samba Shared Repository