sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

param: rename lp function and variable from "recursive_veto_delete" to "delete_veto_files"

Browse Source 
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Garming Sam 2014-02-04 15:08:58 +13:00 committed by Jeremy Allison
parent 2ca2ab3550
commit a1bc448707
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/param/param_functions.c
View File

@ -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)

2
lib/param/param_table.c
View File

@ -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,

2
source3/param/loadparm.c
View File

@ -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,

2
source3/smbd/close.c
View File

@ -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;