summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorGary Lockyer <gary@catalyst.net.nz>2017-03-10 12:43:42 +1300
committerAndrew Bartlett <abartlet@samba.org>2017-03-29 02:37:28 +0200
commit4c9d69f82aa8b2cdb04c5bfe5684dcd1d7ed4cfb (patch)
treebddaeff07a5ccee0324751e4be078ddf622664e8 /source4/ntvfs
parent3d99831ec9492d06f86eabae3439450b66007da8 (diff)
downloadsamba-4c9d69f82aa8b2cdb04c5bfe5684dcd1d7ed4cfb.tar.gz
s4-ntvfs: Correct mixup between local/remote addresses
Signed-off-by: Andrew Bartlett <abartlet@samba.org> Pair-Programmed-by: Gary Lockyer <gary@catalyst.net.nz> Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/ipc/vfs_ipc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c
index a5f2bb1642c..88ac0c1b231 100644
--- a/source4/ntvfs/ipc/vfs_ipc.c
+++ b/source4/ntvfs/ipc/vfs_ipc.c
@@ -253,8 +253,8 @@ static NTSTATUS ipc_open(struct ntvfs_module_context *ntvfs,
struct tevent_req *subreq;
const char *fname;
const char *directory;
- const struct tsocket_address *client_addr;
- const struct tsocket_address *server_addr;
+ const struct tsocket_address *remote_client_addr;
+ const struct tsocket_address *local_server_addr;
switch (oi->generic.level) {
case RAW_OPEN_NTCREATEX:
@@ -321,16 +321,16 @@ static NTSTATUS ipc_open(struct ntvfs_module_context *ntvfs,
NT_STATUS_NOT_OK_RETURN(status);
- client_addr = ntvfs_get_local_address(ipriv->ntvfs);
- server_addr = ntvfs_get_remote_address(ipriv->ntvfs);
+ local_server_addr = ntvfs_get_local_address(ipriv->ntvfs);
+ remote_client_addr = ntvfs_get_remote_address(ipriv->ntvfs);
subreq = tstream_npa_connect_send(p,
ipriv->ntvfs->ctx->event_ctx,
directory,
fname,
- client_addr,
+ remote_client_addr,
NULL,
- server_addr,
+ local_server_addr,
NULL,
state->session_info_transport);
NT_STATUS_HAVE_NO_MEMORY(subreq);