sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

loadparm: rename lp[cfg]_hostsdeny to lp[cfg]_hosts_deny for consistency with docs

Browse Source 
Signed-off-by: Michael Adam <obnox@samba.org>

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
This commit is contained in:
Michael Adam 2014-02-02 14:21:12 +01:00 committed by Andrew Bartlett
parent c48c4daf4a
commit cdb6af95dd
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/param/param_functions.c
View File

@ -29,7 +29,7 @@
FN_LOCAL_STRING(path, path)
FN_LOCAL_LIST(hosts_allow, hosts_allow)
FN_LOCAL_LIST(hostsdeny, hostsdeny)
FN_LOCAL_LIST(hosts_deny, hostsdeny)
FN_LOCAL_STRING(fstype, fstype)
FN_LOCAL_LIST(ntvfs_handler, ntvfs_handler)
FN_LOCAL_BOOL(msdfs_root, msdfs_root)

2
source3/rpc_server/spoolss/srv_spoolss_nt.c
View File

@ -1888,7 +1888,7 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p,
rhost = raddr;
}
if (!allow_access(lp_hostsdeny(snum), lp_hosts_allow(snum),
if (!allow_access(lp_hosts_deny(snum), lp_hosts_allow(snum),
rhost, raddr)) {
DEBUG(3, ("access DENIED (hosts allow/deny) for printer open\n"));
ZERO_STRUCTP(r->out.handle);

4
source3/smbd/process.c
View File

@ -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_hosts_allow(-1),
ok = allow_access(lp_hosts_deny(-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_hosts_allow(-1),
if (!allow_access(lp_hosts_deny(-1), lp_hosts_allow(-1),
sconn->remote_hostname,
remaddr)) {
/*

2
source3/smbd/service.c
View File

@ -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_hosts_allow(snum),
!allow_access(lp_hosts_deny(snum), lp_hosts_allow(snum),
rhost, raddr)) {
return NT_STATUS_ACCESS_DENIED;
}

6
source3/utils/testparm.c
View File

@ -338,7 +338,7 @@ static int do_global_checks(void)
*/
static void do_per_share_checks(int s)
{
const char **deny_list = lp_hostsdeny(s);
const char **deny_list = lp_hosts_deny(s);
const char **allow_list = lp_hosts_allow(s);
int i;
@ -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_hosts_allow(-1), cname, caddr)
&& allow_access(lp_hostsdeny(s), lp_hosts_allow(s), cname, caddr)) {
if (allow_access(lp_hosts_deny(-1), lp_hosts_allow(-1), cname, caddr)
&& allow_access(lp_hosts_deny(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 {

2
source4/param/share_classic.c
View File

@ -291,7 +291,7 @@ static const char **sclassic_string_list_option(TALLOC_CTX *mem_ctx, struct shar
}
if (strcmp(opt_name, SHARE_HOSTS_DENY) == 0) {
return lpcfg_hostsdeny(s, lpcfg_default_service(lp_ctx));
return lpcfg_hosts_deny(s, lpcfg_default_service(lp_ctx));
}
if (strcmp(opt_name, SHARE_NTVFS_HANDLER) == 0) {

2
source4/smbd/service_stream.c
View File

@ -179,7 +179,7 @@ static void stream_new_connection(struct tevent_context *ev,
srv_conn->event.ctx = ev;
srv_conn->lp_ctx = lp_ctx;
if (!socket_check_access(sock, "smbd", lpcfg_hosts_allow(NULL, lpcfg_default_service(lp_ctx)), lpcfg_hostsdeny(NULL, lpcfg_default_service(lp_ctx)))) {
if (!socket_check_access(sock, "smbd", lpcfg_hosts_allow(NULL, lpcfg_default_service(lp_ctx)), lpcfg_hosts_deny(NULL, lpcfg_default_service(lp_ctx)))) {
stream_terminate_connection(srv_conn, "denied by access rules");
return;
}