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

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index fef85507e5097947797c67d63b3c682373667bc5..797c35ee067480a73188e797ad9fd14ab05db2e9 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -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)

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 5433d9c221e0eaebc6a37269ac39edef352dc938..cae3cddf43a0c47cd946d5b5af0c14f31a143ff0 100644 (file)
--- 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_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);

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 93cdb7f0a83cf39807d558c7313cf620ad1d922a..30323a227419dcbe9cadf9a837c34f5da8ef87a8 100644 (file)
--- 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_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)) {
                /*

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 32032afd8f1dad520f5db97026c935fed1a00f98..90f216d003cc9687dcb8db731d4105898e403de7 100644 (file)
--- 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_hosts_allow(snum),
+           !allow_access(lp_hosts_deny(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 f0c8e5fdc4bbdf2c586eb2e87ed8b137cd5b23c2..f905875a658ad4da432efa9dfbf3ce4e0a1146bb 100644 (file)
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -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 {

diff --git a/source4/param/share_classic.c b/source4/param/share_classic.c
index 52a08e382d3aa0929315eddcda41cd0334157d0b..ae7412496cbefa4970779de072267f4249dee31e 100644 (file)
--- a/source4/param/share_classic.c
+++ b/source4/param/share_classic.c
@@ -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) {

diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c
index f6db934e666cc349246dbc2bbb4658bebf4a4024..e19d0085d1d38778cef6ba238f650a2043a8c25e 100644 (file)
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@@ -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;
        }