r5729: partial fixes for BUG 2308; libsmbclient patches from Derrell Lipman <derrell...

(This used to be commit 88678bc05c3018eb181f97523a0b84b60e3c358d)

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 01a92a89ba4884dca7f5314f2487d73b75938348..aa37a29391c53e131116e1ce1d2a200f8a850973 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -888,7 +888,12 @@ BOOL cli_ulogoff(struct cli_state *cli)
        if (!cli_receive_smb(cli))
                return False;
 
-       return !cli_is_error(cli);
+       if (cli_is_error(cli)) {
+               return False;
+       }
+
+        cli->cnum = -1;
+        return True;
 }
 
 /****************************************************************************

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 369fba3521877104ce1967d26e4969b79b80f514..b7bc780a1a195ccd1f00fe579c9f72d329da77de 100644 (file)
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -282,6 +282,7 @@ struct cli_state *cli_initialise(struct cli_state *cli)
        cli->inbuf = (char *)SMB_MALLOC(cli->bufsize+SAFETY_MARGIN);
        cli->oplock_handler = cli_oplock_ack;
        cli->case_sensitive = False;
+       cli->smb_rw_error = 0;
 
        cli->use_spnego = lp_client_use_spnego();