summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-15 11:05:18 +0200
committerVolker Lendecke <vl@samba.org>2010-08-16 22:39:24 +0200
commit897d09174d541a2fcdb35b424167c78b0c5fcce3 (patch)
tree4f4c0bd5658f7af006a0c0050d9c64bd2bd120b3
parent05604b315b41a8af02dc7e28436625cd5236bfbd (diff)
downloadsamba-897d09174d541a2fcdb35b424167c78b0c5fcce3.tar.gz
samba-897d09174d541a2fcdb35b424167c78b0c5fcce3.tar.bz2
samba-897d09174d541a2fcdb35b424167c78b0c5fcce3.zip
s3: Remove smbd_server_fd() from share_sanity_checks
-rw-r--r--source3/smbd/service.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 2bfed9deb5..0ebf87f3a6 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -424,10 +424,10 @@ int find_service(fstring service)
This function modifies dev, ecode.
****************************************************************************/
-static NTSTATUS share_sanity_checks(int snum, fstring dev)
+static NTSTATUS share_sanity_checks(int server_sock, int snum, fstring dev)
{
if (!lp_snum_ok(snum) ||
- !check_access(smbd_server_fd(),
+ !check_access(server_sock,
lp_hostsallow(snum), lp_hostsdeny(snum))) {
return NT_STATUS_ACCESS_DENIED;
}
@@ -659,7 +659,8 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
fstrcpy(dev, pdev);
- if (NT_STATUS_IS_ERR(*pstatus = share_sanity_checks(snum, dev))) {
+ *pstatus = share_sanity_checks(sconn->sock, snum, dev);
+ if (NT_STATUS_IS_ERR(*pstatus)) {
goto err_root_exit;
}