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>

diff --git a/selftest/knownfail b/selftest/knownfail
index 4e402ba0a82296e921d3b09bf24c370927a4a304..707f0e5bba58671d12cdea344b625719af55cc12 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -329,10 +329,7 @@
 ^samba.tests.auth_log.samba.tests.auth_log.AuthLogTests.test_rpc_ncacn_np_krb_dns_smb2
 ^samba.tests.auth_log.samba.tests.auth_log.AuthLogTests.test_rpc_ncacn_np_krb_srv
 ^samba.tests.auth_log.samba.tests.auth_log.AuthLogTests.test_rpc_ncacn_np_krb_srv_sign
-^samba.tests.auth_log.samba.tests.auth_log.AuthLogTests.test_rpc_ncacn_np_ntlm_dns\(ad_dc_ntvfs:local\)
-^samba.tests.auth_log.samba.tests.auth_log.AuthLogTests.test_rpc_ncacn_np_ntlm_dns_sign\(ad_dc_ntvfs:local\)
-^samba.tests.auth_log.samba.tests.auth_log.AuthLogTests.test_rpc_ncacn_np_ntlm_srv\(
-^samba.tests.auth_log.samba.tests.auth_log.AuthLogTests.test_rpc_ncacn_np_ntlm_srv_sign\(ad_dc_ntvfs:local\)
+^samba.tests.auth_log.samba.tests.auth_log.AuthLogTests.test_rpc_ncacn_np_ntlm_srv\(ad_dc:local\)
 ^samba.tests.auth_log.samba.tests.auth_log.AuthLogTests.test_smb\(
 ^samba.tests.auth_log.samba.tests.auth_log.AuthLogTests.test_smb_bad_password
 ^samba.tests.auth_log.samba.tests.auth_log.AuthLogTests.test_smb_bad_user

diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c
index a5f2bb1642c56888b302f3f009c0dd74dcb640e5..88ac0c1b23116023b8f8188222734fe963953782 100644 (file)
--- 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);