svn commit: samba r21994 - in branches/SAMBA_3_0/source/libsmb: .

[jra at samba.org]

Author: jra
Date: 2007-03-27 22:37:42 +0000 (Tue, 27 Mar 2007)
New Revision: 21994

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21994

Log:
Ignore keepalives in the correct buffer (out not in :-).
Jeremy.

Modified:
   branches/SAMBA_3_0/source/libsmb/clientgen.c
   branches/SAMBA_3_0/source/libsmb/smb_seal.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/clientgen.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/clientgen.c	2007-03-27 22:27:06 UTC (rev 21993)
+++ branches/SAMBA_3_0/source/libsmb/clientgen.c	2007-03-27 22:37:42 UTC (rev 21994)
@@ -107,7 +107,7 @@
  again:
 	ret = client_receive_smb(cli, eat_keepalives);
 
-	if (!eat_keepalives && (CVAL(cli->inbuf,0) == SMBkeepalive)) {
+	if (ret && !eat_keepalives && (CVAL(cli->inbuf,0) == SMBkeepalive)) {
 		/* Give back the keepalive. */
 		return True;
 	}

Modified: branches/SAMBA_3_0/source/libsmb/smb_seal.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/smb_seal.c	2007-03-27 22:27:06 UTC (rev 21993)
+++ branches/SAMBA_3_0/source/libsmb/smb_seal.c	2007-03-27 22:37:42 UTC (rev 21994)
@@ -471,7 +471,7 @@
 NTSTATUS cli_encrypt_message(struct cli_state *cli, char **buf_out)
 {
 	/* Ignore session keepalives. */
-	if(CVAL(cli->inbuf,0) == SMBkeepalive) {
+	if(CVAL(cli->outbuf,0) == SMBkeepalive) {
 		return NT_STATUS_OK;
 	}