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

[jerry at samba.org]

Author: jerry
Date: 2005-03-10 20:14:24 +0000 (Thu, 10 Mar 2005)
New Revision: 5729

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

Log:
partial fixes for BUG 2308; libsmbclient patches from Derrell Lipman <derrell.lipman at unwireduniverse.com>
Modified:
   branches/SAMBA_3_0/source/libsmb/cliconnect.c
   branches/SAMBA_3_0/source/libsmb/clientgen.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/cliconnect.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/cliconnect.c	2005-03-10 19:06:12 UTC (rev 5728)
+++ branches/SAMBA_3_0/source/libsmb/cliconnect.c	2005-03-10 20:14:24 UTC (rev 5729)
@@ -888,7 +888,12 @@
 	if (!cli_receive_smb(cli))
 		return False;
 
-	return !cli_is_error(cli);
+	if (cli_is_error(cli)) {
+		return False;
+	}
+
+        cli->cnum = -1;
+        return True;
 }
 
 /****************************************************************************

Modified: branches/SAMBA_3_0/source/libsmb/clientgen.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/clientgen.c	2005-03-10 19:06:12 UTC (rev 5728)
+++ branches/SAMBA_3_0/source/libsmb/clientgen.c	2005-03-10 20:14:24 UTC (rev 5729)
@@ -282,6 +282,7 @@
 	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();