diff options
| -rw-r--r-- | lib/param/param_functions.c | 1 | ||||
| -rw-r--r-- | lib/param/param_table.c | 10 | ||||
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 1 |
4 files changed, 13 insertions, 0 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index fed2e95bf7..61f00448ca 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -132,6 +132,7 @@ FN_LOCAL_BOOL(afs_share, bAfs_Share) FN_LOCAL_BOOL(acl_check_permissions, bAclCheckPermissions) FN_LOCAL_BOOL(acl_group_control, bAclGroupControl) FN_LOCAL_BOOL(acl_map_full_control, bAclMapFullControl) +FN_LOCAL_BOOL(acl_allow_execute_always, bAclAllowExecuteAlways) FN_LOCAL_INTEGER(defaultcase, iDefaultCase) FN_LOCAL_INTEGER(minprintspace, iMinPrintSpace) FN_LOCAL_INTEGER(printing, iPrinting) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 1b1497cc64..7b32998084 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -904,6 +904,16 @@ static struct parm_struct parm_table[] = { .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE, }, { + .label = "acl allow execute always", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bAclAllowExecuteAlways), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE, + }, + + { .label = "create mask", .type = P_OCTAL, .p_class = P_LOCAL, diff --git a/source3/include/proto.h b/source3/include/proto.h index df65711d65..804575a2b0 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1330,6 +1330,7 @@ bool lp_afs_share(int ); bool lp_acl_check_permissions(int ); bool lp_acl_group_control(int ); bool lp_acl_map_full_control(int ); +bool lp_acl_allow_execute_always(int); bool lp_durable_handles(int); int lp_create_mask(int ); int lp_force_create_mode(int ); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 229ebd8bd1..b9945ac8b9 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -264,6 +264,7 @@ static struct loadparm_service sDefault = .bAclCheckPermissions = true, .bAclMapFullControl = true, .bAclGroupControl = false, + .bAclAllowExecuteAlways = false, .bChangeNotify = true, .bKernelChangeNotify = true, .iallocation_roundup_size = SMB_ROUNDUP_ALLOCATION_SIZE, |