summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-04-26 13:34:44 +0200
committerStefan Metzmacher <metze@samba.org>2010-04-27 13:01:59 +0200
commit8fb3292c993302b74247d6fa4795b279b131abcf (patch)
treea4379b7e61bc194fb96df1317fa22bd750772a9f
parentc04d809ba001ebca17b68eae3a9f7d37454a290c (diff)
downloadsamba-8fb3292c993302b74247d6fa4795b279b131abcf.tar.gz
samba-8fb3292c993302b74247d6fa4795b279b131abcf.tar.bz2
samba-8fb3292c993302b74247d6fa4795b279b131abcf.zip
s4:smb_server: pass tsocket_addresses to the ntvfs layer
metze
-rw-r--r--source4/smb_server/smb/service.c6
-rw-r--r--source4/smb_server/smb2/tcon.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/source4/smb_server/smb/service.c b/source4/smb_server/smb/service.c
index 805dc4d558..4d5b6ff462 100644
--- a/source4/smb_server/smb/service.c
+++ b/source4/smb_server/smb/service.c
@@ -70,9 +70,11 @@ static NTSTATUS make_connection_scfg(struct smbsrv_request *req,
goto failed;
}
- status = ntvfs_set_addr_callbacks(tcon->ntvfs, smbsrv_get_my_addr, smbsrv_get_peer_addr, req->smb_conn);
+ status = ntvfs_set_addresses(tcon->ntvfs,
+ req->smb_conn->connection->local_address,
+ req->smb_conn->connection->remote_address);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,("make_connection: NTVFS failed to set the addr callbacks!\n"));
+ DEBUG(0,("make_connection: NTVFS failed to set the addresses!\n"));
goto failed;
}
diff --git a/source4/smb_server/smb2/tcon.c b/source4/smb_server/smb2/tcon.c
index ed5a262b81..4247ef8723 100644
--- a/source4/smb_server/smb2/tcon.c
+++ b/source4/smb_server/smb2/tcon.c
@@ -304,9 +304,11 @@ static NTSTATUS smb2srv_tcon_backend(struct smb2srv_request *req, union smb_tcon
goto failed;
}
- status = ntvfs_set_addr_callbacks(tcon->ntvfs, smbsrv_get_my_addr, smbsrv_get_peer_addr, req->smb_conn);
+ status = ntvfs_set_addresses(tcon->ntvfs,
+ req->smb_conn->connection->local_address,
+ req->smb_conn->connection->remote_address);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,("smb2srv_tcon_backend: NTVFS failed to set the addr callbacks!\n"));
+ DEBUG(0,("smb2srv_tcon_backend: NTVFS failed to set the address!\n"));
goto failed;
}