param: rename lp function and variable from "recursive_veto_delete" to "delete_veto_f...

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 16a66e4ebfefe66bc5f1bc1beb8a40285a3998fb..fa87d1b2483b8a778b874be1785a8029e66c5586 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -110,7 +110,7 @@ FN_LOCAL_BOOL(syncalways, syncalways)
 FN_LOCAL_BOOL(strict_allocate, strict_allocate)
 FN_LOCAL_BOOL(delete_readonly, delete_readonly)
 FN_LOCAL_BOOL(fake_oplocks, fake_oplocks)
-FN_LOCAL_BOOL(recursive_veto_delete, recursive_veto_delete)
+FN_LOCAL_BOOL(delete_veto_files, delete_veto_files)
 FN_LOCAL_BOOL(dos_filemode, dos_filemode)
 FN_LOCAL_BOOL(dos_filetimes, dos_filetimes)
 FN_LOCAL_BOOL(dos_filetime_resolution, dos_filetime_resolution)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index f36763986c1cb76948538c94a7a48f01ceac038f..b4bb7e4892611844443364f7bb184881020338a1 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2460,7 +2460,7 @@ static struct parm_struct parm_table[] = {
                .label          = "delete veto files",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(recursive_veto_delete),
+               .offset         = LOCAL_VAR(delete_veto_files),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 22d58d24736a191a1d910071de08fa75c74afcf2..4def30bdc2ebd112264f7bea830d9d824c8149e3 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -241,7 +241,7 @@ static struct loadparm_service sDefault =
        .copymap = NULL,
        .delete_readonly = false,
        .fake_oplocks = false,
-       .recursive_veto_delete = false,
+       .delete_veto_files = false,
        .dos_filemode = false,
        .dos_filetimes = true,
        .dos_filetime_resolution = false,

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 02babb7a9efbb310de977523dae013a960ba99a0..cb6882a90dfcb8187169f821fbd14674f1376ddc 100644 (file)
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -948,7 +948,7 @@ static NTSTATUS rmdir_internals(TALLOC_CTX *ctx, files_struct *fsp)
                /* We only have veto files/directories.
                 * Are we allowed to delete them ? */
 
-               if(!lp_recursive_veto_delete(SNUM(conn))) {
+               if(!lp_delete_veto_files(SNUM(conn))) {
                        TALLOC_FREE(dir_hnd);
                        errno = ENOTEMPTY;
                        goto err;