summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-03-27 22:27:06 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:18:58 -0500
commit208367f4d1869843d024a06313a965455b9ee3be (patch)
tree705cd38fefb54564eb0898a26f03ada61681ea9e
parent0eab4311946c312795ec5c03c25a340ef0bfc624 (diff)
downloadsamba-208367f4d1869843d024a06313a965455b9ee3be.tar.gz
samba-208367f4d1869843d024a06313a965455b9ee3be.tar.bz2
samba-208367f4d1869843d024a06313a965455b9ee3be.zip
r21993: Don't let keepalives interferece with sign or seal
in the client code. Jeremy. (This used to be commit 3e901389feedadd64c6ba712ab09cdfb497a9e0a)
-rw-r--r--source3/libsmb/clientgen.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index b3c38f39ae..95d7cdadd7 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -106,6 +106,11 @@ 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)) {
+ /* Give back the keepalive. */
+ return True;
+ }
if (ret) {
/* it might be an oplock break request */