diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-10-18 16:07:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:01:53 -0500 |
| commit | 2c081d2c47452acff3115637bbd16f780e23b76a (patch) | |
| tree | 6e7f1a0d973daca8b820f807c8c2f08b4de32138 | |
| parent | 80a30263aacd3ae97843a90d36f357f72c7f7f31 (diff) | |
| download | samba-2c081d2c47452acff3115637bbd16f780e23b76a.tar.gz samba-2c081d2c47452acff3115637bbd16f780e23b76a.tar.bz2 samba-2c081d2c47452acff3115637bbd16f780e23b76a.zip | |
r3046: \\PIPE\\ is internal (not actually included on the wire)
(This used to be commit 7771b5d8fa3db759487474eb7172df45bb3221ae)
| -rw-r--r-- | source4/librpc/rpc/dcerpc_util.c | 7 | ||||
| -rw-r--r-- | source4/ntvfs/ipc/vfs_ipc.c | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index a82f30f3e5..87a9073a73 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/librpc/rpc/dcerpc_util.c @@ -452,14 +452,11 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_np(struct dcerpc_pipe **p, 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, diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c index 8c32a78512..238467a746 100644 --- a/source4/ntvfs/ipc/vfs_ipc.c +++ b/source4/ntvfs/ipc/vfs_ipc.c @@ -215,7 +215,7 @@ static NTSTATUS ipc_open_generic(struct ntvfs_module_context *ntvfs, 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; |