loadparm: add new parameter "acl allow execute always"

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index fed2e95bf76b69cc1a485f29afd6037d092c0e3a..61f00448ca3d9305c9d696e918c806e7de30e272 100644 (file)
--- 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 1b1497cc6456c4de38f16778da92ca5d2c779c3c..7b32998084cd667e3095aacf8720ad0392cd45ce 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -903,6 +903,16 @@ static struct parm_struct parm_table[] = {
                .enum_list      = NULL,
                .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,

diff --git a/source3/include/proto.h b/source3/include/proto.h
index df65711d65b0f1ef9f9db05d3241a12e54faecf8..804575a2b08e2c9bf192440a7a6cf396d5729555 100644 (file)
--- 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 229ebd8bd16a1c33b1901e829515a76e5b93912a..b9945ac8b9cb98d45aa994ba2b61b54c680b72cb 100644 (file)
--- 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,