summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/rpc_server/spoolss/srv_spoolss_nt.c2
-rw-r--r--source3/smbd/process.c4
-rw-r--r--source3/smbd/service.c2
-rw-r--r--source3/utils/testparm.c6
4 files changed, 7 insertions, 7 deletions
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 150b6ca0ad9..5433d9c221e 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -1888,7 +1888,7 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p,
rhost = raddr;
}
- if (!allow_access(lp_hostsdeny(snum), lp_hostsallow(snum),
+ if (!allow_access(lp_hostsdeny(snum), lp_hosts_allow(snum),
rhost, raddr)) {
DEBUG(3, ("access DENIED (hosts allow/deny) for printer open\n"));
ZERO_STRUCTP(r->out.handle);
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 1f4cfe7e65f..93cdb7f0a83 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1545,7 +1545,7 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req)
* Haven't we checked this in smbd_process already???
*/
- ok = allow_access(lp_hostsdeny(-1), lp_hostsallow(-1),
+ ok = allow_access(lp_hostsdeny(-1), lp_hosts_allow(-1),
sconn->remote_hostname, raddr);
TALLOC_FREE(raddr);
@@ -3483,7 +3483,7 @@ void smbd_process(struct tevent_context *ev_ctx,
sconn->remote_hostname,
locaddr);
- if (!allow_access(lp_hostsdeny(-1), lp_hostsallow(-1),
+ if (!allow_access(lp_hostsdeny(-1), lp_hosts_allow(-1),
sconn->remote_hostname,
remaddr)) {
/*
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 61b655ba023..32032afd8f1 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -248,7 +248,7 @@ static NTSTATUS share_sanity_checks(const struct tsocket_address *remote_address
}
if (!lp_snum_ok(snum) ||
- !allow_access(lp_hostsdeny(snum), lp_hostsallow(snum),
+ !allow_access(lp_hostsdeny(snum), lp_hosts_allow(snum),
rhost, raddr)) {
return NT_STATUS_ACCESS_DENIED;
}
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 7e49c080642..f0c8e5fdc4b 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -339,7 +339,7 @@ static int do_global_checks(void)
static void do_per_share_checks(int s)
{
const char **deny_list = lp_hostsdeny(s);
- const char **allow_list = lp_hostsallow(s);
+ const char **allow_list = lp_hosts_allow(s);
int i;
if(deny_list) {
@@ -569,8 +569,8 @@ static void do_per_share_checks(int s)
/* this is totally ugly, a real `quick' hack */
for (s=0;s<1000;s++) {
if (VALID_SNUM(s)) {
- if (allow_access(lp_hostsdeny(-1), lp_hostsallow(-1), cname, caddr)
- && allow_access(lp_hostsdeny(s), lp_hostsallow(s), cname, caddr)) {
+ if (allow_access(lp_hostsdeny(-1), lp_hosts_allow(-1), cname, caddr)
+ && allow_access(lp_hostsdeny(s), lp_hosts_allow(s), cname, caddr)) {
fprintf(stderr,"Allow connection from %s (%s) to %s\n",
cname,caddr,lp_servicename(talloc_tos(), s));
} else {