From a1bc448707f6ae308692cce23a2e55ffff33a23d Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Tue, 4 Feb 2014 15:08:58 +1300 Subject: [PATCH] param: rename lp function and variable from "recursive_veto_delete" to "delete_veto_files" Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison --- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 2 +- source3/param/loadparm.c | 2 +- source3/smbd/close.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 16a66e4ebfe..fa87d1b2483 100644 --- 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 f36763986c1..b4bb7e48926 100644 --- 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 22d58d24736..4def30bdc2e 100644 --- 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 02babb7a9ef..cb6882a90df 100644 --- 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; -- 2.11.4.GIT