diff options
| author | Jeremy Allison <jra@samba.org> | 2007-03-27 22:37:42 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:18:58 -0500 |
| commit | 3215c09a8147e7df111e4e0817091285cd7240cb (patch) | |
| tree | 29486a0e0681939a697a2a1b03e1415ad20de547 | |
| parent | 208367f4d1869843d024a06313a965455b9ee3be (diff) | |
| download | samba-3215c09a8147e7df111e4e0817091285cd7240cb.tar.gz samba-3215c09a8147e7df111e4e0817091285cd7240cb.tar.bz2 samba-3215c09a8147e7df111e4e0817091285cd7240cb.zip | |
r21994: Ignore keepalives in the correct buffer (out not in :-).
Jeremy.
(This used to be commit 9785528ddf26c4943e8bdfcf7694314a52218520)
| -rw-r--r-- | source3/libsmb/clientgen.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/smb_seal.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 95d7cdadd7..e4712d2f65 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -107,7 +107,7 @@ BOOL cli_receive_smb_internal(struct cli_state *cli, BOOL eat_keepalives) 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; } diff --git a/source3/libsmb/smb_seal.c b/source3/libsmb/smb_seal.c index c80b7f0a90..ed2c66013e 100644 --- a/source3/libsmb/smb_seal.c +++ b/source3/libsmb/smb_seal.c @@ -471,7 +471,7 @@ NTSTATUS cli_decrypt_message(struct cli_state *cli) 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; } |