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

[derrell at samba.org]

Author: derrell
Date: 2005-12-14 18:15:54 +0000 (Wed, 14 Dec 2005)
New Revision: 12235

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

Log:
 r11738 at cabra:  derrell | 2005-12-14 13:15:14 -0500
 Ensure that when libsmbclient copies a cli, it prevents the cli from later
 being freed, by turning off the 'allocated' flag.
 
 Change a DEBUG message in pipe_open code from level 0 to level 1 since 
 libsmbclient is now regularly attempting to open a pipe for share enumeration,
 and falling back to RAP if RPC is unavailable (e.g. win98).  We don't want
 the debug message to display when the pipe open fails, under these normal 
 circumstances.
 

Modified:
   branches/SAMBA_3_0/
   branches/SAMBA_3_0/source/libsmb/libsmbclient.c


Changeset:

Property changes on: branches/SAMBA_3_0
___________________________________________________________________
Name: svk:merge
   - 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba3:11729
   + 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba3:11738

Modified: branches/SAMBA_3_0/source/libsmb/libsmbclient.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-12-14 17:46:29 UTC (rev 12234)
+++ branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-12-14 18:15:54 UTC (rev 12235)
@@ -774,6 +774,7 @@
 
 	ZERO_STRUCTP(srv);
 	srv->cli = c;
+        srv->cli.allocated = False;
 	srv->dev = (dev_t)(str_checksum(server) ^ str_checksum(share));
         srv->no_pathinfo = False;
         srv->no_pathinfo2 = False;
@@ -863,6 +864,7 @@
 
                 ZERO_STRUCTP(ipc_srv);
                 ipc_srv->cli = *ipc_cli;
+                ipc_srv->cli.allocated = False;
 
                 free(ipc_cli);