svn commit: samba r12259 - in branches/SAMBA_3_0_RELEASE: . source/libsmb source/rpc_client

jerry at samba.org jerry at samba.org
Thu Dec 15 17:55:25 GMT 2005


Author: jerry
Date: 2005-12-15 17:55:21 +0000 (Thu, 15 Dec 2005)
New Revision: 12259

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

Log:
picking up derrell's libsmbclient fixes
Modified:
   branches/SAMBA_3_0_RELEASE/
   branches/SAMBA_3_0_RELEASE/source/libsmb/clientgen.c
   branches/SAMBA_3_0_RELEASE/source/rpc_client/cli_pipe.c


Changeset:

Property changes on: branches/SAMBA_3_0_RELEASE
___________________________________________________________________
Name: svk:merge
   + 

Modified: branches/SAMBA_3_0_RELEASE/source/libsmb/clientgen.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/libsmb/clientgen.c	2005-12-15 17:53:59 UTC (rev 12258)
+++ branches/SAMBA_3_0_RELEASE/source/libsmb/clientgen.c	2005-12-15 17:55:21 UTC (rev 12259)
@@ -358,11 +358,13 @@
 void cli_rpc_pipe_close(struct rpc_pipe_client *cli)
 {
 	if (!cli_close(cli->cli, cli->fnum)) {
-		DEBUG(0,("cli_rpc_pipe_close: cli_close failed on pipe %s "
-			"to machine %s.  Error was %s\n",
-			cli->pipe_name,
-			cli->cli->desthost,
-			cli_errstr(cli->cli)));
+		DEBUG(0,("cli_rpc_pipe_close: cli_close failed on pipe %s, "
+                         "fnum 0x%x "
+                         "to machine %s.  Error was %s\n",
+                         cli->pipe_name,
+                         (int) cli->fnum,
+                         cli->cli->desthost,
+                         cli_errstr(cli->cli)));
 	}
 
 	if (cli->auth.cli_auth_data_free_func) {

Modified: branches/SAMBA_3_0_RELEASE/source/rpc_client/cli_pipe.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/rpc_client/cli_pipe.c	2005-12-15 17:53:59 UTC (rev 12258)
+++ branches/SAMBA_3_0_RELEASE/source/rpc_client/cli_pipe.c	2005-12-15 17:55:21 UTC (rev 12259)
@@ -2150,6 +2150,15 @@
 
 /****************************************************************************
  Open a named pipe over SMB to a remote server.
+ *
+ * CAVEAT CALLER OF THIS FUNCTION:
+ *    The returned rpc_pipe_client saves a copy of the cli_state cli pointer,
+ *    so be sure that this function is called AFTER any structure (vs pointer)
+ *    assignment of the cli.  In particular, libsmbclient does structure
+ *    assignments of cli, which invalidates the data in the returned
+ *    rpc_pipe_client if this function is called before the structure assignment
+ *    of cli.
+ * 
  ****************************************************************************/
 
 static struct rpc_pipe_client *cli_rpc_pipe_open(struct cli_state *cli, int pipe_idx, NTSTATUS *perr)
@@ -2180,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)));



More information about the samba-cvs mailing list