svn commit: samba r12237 - in trunk: . source/libsmb source/rpc_client

[derrell at samba.org]

Author: derrell
Date: 2005-12-14 18:20:19 +0000 (Wed, 14 Dec 2005)
New Revision: 12237

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

Log:
 r11773 at cabra:  derrell | 2005-12-14 13:19:54 -0500
 merge changes from samba_3_0

Modified:
   trunk/
   trunk/source/libsmb/libsmbclient.c
   trunk/source/rpc_client/cli_pipe.c


Changeset:

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba-trunk:10820
   + 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba-trunk:11773

Modified: trunk/source/libsmb/libsmbclient.c
===================================================================
--- trunk/source/libsmb/libsmbclient.c	2005-12-14 18:17:05 UTC (rev 12236)
+++ trunk/source/libsmb/libsmbclient.c	2005-12-14 18:20:19 UTC (rev 12237)
@@ -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);
 

Modified: trunk/source/rpc_client/cli_pipe.c
===================================================================
--- trunk/source/rpc_client/cli_pipe.c	2005-12-14 18:17:05 UTC (rev 12236)
+++ trunk/source/rpc_client/cli_pipe.c	2005-12-14 18:20:19 UTC (rev 12237)
@@ -2189,7 +2189,7 @@
 	fnum = cli_nt_create(cli, result->pipe_name, DESIRED_ACCESS_PIPE);
 
 	if (fnum == -1) {
-		DEBUG(0,("cli_rpc_pipe_open: cli_nt_create failed on pipe %s "
+		DEBUG(1,("cli_rpc_pipe_open: cli_nt_create failed on pipe %s "
 			 "to machine %s.  Error was %s\n",
 			 result->pipe_name, cli->desthost,
 			 cli_errstr(cli)));