summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-28 17:16:08 +0200
committerVolker Lendecke <vl@samba.org>2010-08-29 21:55:24 +0200
commit744cc264517ac440d606570f6e36b8aa1ba836f3 (patch)
treec869d719522f01da316f306f04bb58830c451994 /source3
parent5bbc4df1680342a5d0678462bac66d5e536219f6 (diff)
downloadsamba-744cc264517ac440d606570f6e36b8aa1ba836f3.tar.gz
samba-744cc264517ac440d606570f6e36b8aa1ba836f3.tar.bz2
samba-744cc264517ac440d606570f6e36b8aa1ba836f3.zip
s3: Remove smbd_server_fd() from smbd_register_ips
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/process.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index f6a199e2d6..782232cd76 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2889,7 +2889,8 @@ fail:
return false;
}
-static NTSTATUS smbd_register_ips(struct sockaddr_storage *srv,
+static NTSTATUS smbd_register_ips(struct smbd_server_connection *sconn,
+ struct sockaddr_storage *srv,
struct sockaddr_storage *clnt)
{
struct ctdbd_connection *cconn;
@@ -2901,7 +2902,7 @@ static NTSTATUS smbd_register_ips(struct sockaddr_storage *srv,
return NT_STATUS_NO_MEMORY;
}
- client_socket_addr(smbd_server_fd(),addr,sizeof(addr));
+ client_socket_addr(sconn->sock, addr, sizeof(addr));
addr = talloc_strdup(cconn, tmp_addr);
if (addr == NULL) {
return NT_STATUS_NO_MEMORY;
@@ -3109,7 +3110,7 @@ void smbd_process(struct smbd_server_connection *sconn)
if (client_get_tcp_info(&srv, &clnt) == 0) {
NTSTATUS status;
- status = smbd_register_ips(&srv, &clnt);
+ status = smbd_register_ips(sconn, &srv, &clnt);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("ctdbd_register_ips failed: %s\n",
nt_errstr(status)));