summaryrefslogtreecommitdiffstats
path: root/source3
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-02-04 15:09:03 +1300
committerJeremy Allison <jra@samba.org>2014-02-07 16:19:13 -0800
commite07f8aeeac5f8b0be7d28159793b237e9f3547df (patch)
tree4dabd82b7d09a9bb2ed6baf1475be28e1b190fc1 /source3
parentd2b6e331c644f3bc4a5b7adb5c3c30aad3b017a8 (diff)
downloadsamba-e07f8aeeac5f8b0be7d28159793b237e9f3547df.tar.gz
samba-e07f8aeeac5f8b0be7d28159793b237e9f3547df.tar.xz
samba-e07f8aeeac5f8b0be7d28159793b237e9f3547df.zip
param: rename lp function and variable from "magicscript" to "magic_script"
Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/param/loadparm.c2
-rw-r--r--source3/smbd/close.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 6e8313f195..17ea74b8a8 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -170,7 +170,7 @@ static struct loadparm_service sDefault =
.dont_descend = NULL,
.hosts_allow = NULL,
.hosts_deny = NULL,
- .magicscript = NULL,
+ .magic_script = NULL,
.magic_output = NULL,
.veto_files = NULL,
.hide_files = NULL,
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index b53c765508..4fbd442fc3 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -47,7 +47,7 @@ static NTSTATUS check_magic(struct files_struct *fsp)
char *fname = NULL;
NTSTATUS status;
- if (!*lp_magicscript(talloc_tos(), SNUM(conn))) {
+ if (!*lp_magic_script(talloc_tos(), SNUM(conn))) {
return NT_STATUS_OK;
}
@@ -63,7 +63,7 @@ static NTSTATUS check_magic(struct files_struct *fsp)
p++;
}
- if (!strequal(lp_magicscript(talloc_tos(), SNUM(conn)),p)) {
+ if (!strequal(lp_magic_script(talloc_tos(), SNUM(conn)),p)) {
status = NT_STATUS_OK;
goto out;
}