summaryrefslogtreecommitdiff
path: root/source3/smbd/service.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-18 16:48:20 +0200
committerVolker Lendecke <vl@samba.org>2010-08-22 14:28:34 +0200
commit70c5bed4b2ca4660e8a06cee6d4e813744cc7be8 (patch)
tree1bc9805b67355df382dc1d37c1951503eba23f1a /source3/smbd/service.c
parentbc69a9d0d8aa746c2db88484ebf48f9aa7d73de6 (diff)
downloadsamba-70c5bed4b2ca4660e8a06cee6d4e813744cc7be8.tar.gz
samba-70c5bed4b2ca4660e8a06cee6d4e813744cc7be8.tar.bz2
samba-70c5bed4b2ca4660e8a06cee6d4e813744cc7be8.zip
s3: Replace calls to check_access by allow_access
We already have both the name and address of the client stored now
Diffstat (limited to 'source3/smbd/service.c')
-rw-r--r--source3/smbd/service.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index ef74b397c3..d395572856 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -424,11 +424,12 @@ int find_service(fstring service)
This function modifies dev, ecode.
****************************************************************************/
-static NTSTATUS share_sanity_checks(int server_sock, int snum, fstring dev)
+static NTSTATUS share_sanity_checks(struct client_address *client_id, int snum,
+ fstring dev)
{
if (!lp_snum_ok(snum) ||
- !check_access(server_sock,
- lp_hostsallow(snum), lp_hostsdeny(snum))) {
+ !allow_access(lp_hostsdeny(snum), lp_hostsallow(snum),
+ client_id->name, client_id->addr)) {
return NT_STATUS_ACCESS_DENIED;
}
@@ -658,7 +659,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
fstrcpy(dev, pdev);
- *pstatus = share_sanity_checks(sconn->sock, snum, dev);
+ *pstatus = share_sanity_checks(&sconn->client_id, snum, dev);
if (NT_STATUS_IS_ERR(*pstatus)) {
goto err_root_exit;
}