diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-18 16:48:20 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-22 14:28:34 +0200 |
| commit | 70c5bed4b2ca4660e8a06cee6d4e813744cc7be8 (patch) | |
| tree | 1bc9805b67355df382dc1d37c1951503eba23f1a /source3/smbd | |
| parent | bc69a9d0d8aa746c2db88484ebf48f9aa7d73de6 (diff) | |
| download | samba-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')
| -rw-r--r-- | source3/smbd/process.c | 10 | ||||
| -rw-r--r-- | source3/smbd/service.c | 9 |
2 files changed, 11 insertions, 8 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index d6acc829cf..126b6b797e 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -1554,8 +1554,9 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req, in /* does this protocol need to be run as guest? */ if ((flags & AS_GUEST) && (!change_to_guest() || - !check_access(sconn->sock, lp_hostsallow(-1), - lp_hostsdeny(-1)))) { + !allow_access(lp_hostsdeny(-1), lp_hostsallow(-1), + sconn->client_id.name, + sconn->client_id.addr))) { reply_nterror(req, NT_STATUS_ACCESS_DENIED); return conn; } @@ -2982,8 +2983,9 @@ void smbd_process(struct smbd_server_connection *sconn) * the hosts allow list. */ - if (!check_access(sconn->sock, lp_hostsallow(-1), - lp_hostsdeny(-1))) { + if (!allow_access(lp_hostsdeny(-1), lp_hostsallow(-1), + sconn->client_id.name, + sconn->client_id.addr)) { /* * send a negative session response "not listening on calling * name" 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; } |