summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-09-09 12:24:08 +0200
committerKarolin Seeger <kseeger@samba.org>2009-09-09 14:25:18 +0200
commit2e900086e86da37ff49978537ef67d5b9fad9a2e (patch)
tree82c4b217dd1a5b63941bd80049bd83968d6b80e2
parent74ec7766bf036b0acbf80e8030dec8427ee6a71d (diff)
downloadsamba-2e900086e86da37ff49978537ef67d5b9fad9a2e.tar.gz
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@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)
-rw-r--r--source3/libsmb/async_smb.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 066ac7bdb88..07d832e1b24 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;