svn commit: samba r3046 - in branches/SAMBA_4_0/source: librpc/rpc ntvfs/ipc

[jelmer at samba.org]

Author: jelmer
Date: 2004-10-18 16:07:08 +0000 (Mon, 18 Oct 2004)
New Revision: 3046

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=3046&nolog=1

Log:
\\PIPE\\ is internal (not actually included on the wire)

Modified:
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
   branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c	2004-10-18 15:33:34 UTC (rev 3045)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c	2004-10-18 16:07:08 UTC (rev 3046)
@@ -452,14 +452,11 @@
 		pipe_name = binding->options[0];
 	}
 
-	if (!strncasecmp(pipe_name, "/pipe/", 6)) {
+	if (!strncasecmp(pipe_name, "/pipe/", 6) || 
+		!strncasecmp(pipe_name, "\\pipe\\", 6)) {
 		pipe_name+=6;
 	}
 	
-	if (strncasecmp(pipe_name, "\\pipe\\", 6)) {
-		pipe_name = talloc_asprintf(mem_ctx, "\\pipe\\%s", pipe_name);
-	}
-	    
 	if (!username || !username[0]) {
 		status = smbcli_full_connection(NULL, &cli, lp_netbios_name(),
 					     binding->host, NULL, 

Modified: branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c	2004-10-18 15:33:34 UTC (rev 3045)
+++ branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c	2004-10-18 16:07:08 UTC (rev 3046)
@@ -215,7 +215,7 @@
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	p->pipe_name = talloc_strdup(p, fname);
+	p->pipe_name = talloc_asprintf(p, "\\pipe\\%s", fname);
 	if (!p->pipe_name) {
 		talloc_free(p);
 		return NT_STATUS_NO_MEMORY;