From 1daffaff09858e1c3501e2aa2f5ec9261ba95d60 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 24 Dec 2013 16:03:37 +1300 Subject: [PATCH] param: Rename variable used for lp_acl_group_control bAclGroupControl Signed-off-by: Andrew Bartlett Signed-off-by: Garming Sam Reviewed-by: Jeremy Allison --- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 2 +- source3/param/loadparm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 1ac758a7d39..ae2a591bb81 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -130,7 +130,7 @@ FN_LOCAL_BOOL(profile_acls, profile_acls) FN_LOCAL_BOOL(map_acl_inherit, map_acl_inherit) FN_LOCAL_BOOL(afs_share, afs_share) FN_LOCAL_BOOL(acl_check_permissions, acl_check_permissions) -FN_LOCAL_BOOL(acl_group_control, bAclGroupControl) +FN_LOCAL_BOOL(acl_group_control, acl_group_control) FN_LOCAL_BOOL(acl_map_full_control, bAclMapFullControl) FN_LOCAL_BOOL(acl_allow_execute_always, bAclAllowExecuteAlways) FN_LOCAL_INTEGER(defaultcase, iDefaultCase) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index cd1f331c010..3309ea7de20 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -890,7 +890,7 @@ static struct parm_struct parm_table[] = { .label = "acl group control", .type = P_BOOL, .p_class = P_LOCAL, - .offset = LOCAL_VAR(bAclGroupControl), + .offset = LOCAL_VAR(acl_group_control), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index ae7ad928dca..ffa5730eed0 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -263,7 +263,7 @@ static struct loadparm_service sDefault = .ea_support = false, .acl_check_permissions = true, .bAclMapFullControl = true, - .bAclGroupControl = false, + .acl_group_control = false, .bAclAllowExecuteAlways = false, .bChangeNotify = true, .bKernelChangeNotify = true, -- 2.11.4.GIT