param_table: Remove misleading allow dns updates options.

[obnox/samba/samba-obnox.git] / lib / param / param_table.c

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index cb9596c5f7dc253b8627dac913305cf2ed2b58a0..7ff9d0cbcca7807a4892fcc0439f89d3e2ff5f65 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -48,9 +48,7 @@ static const struct enum_list enum_security[] = {
        {SEC_AUTO, "AUTO"},
        {SEC_USER, "USER"},
        {SEC_DOMAIN, "DOMAIN"},
-#if (defined(HAVE_ADS) || _SAMBA_BUILD_ >= 4)
        {SEC_ADS, "ADS"},
-#endif
        {-1, NULL}
 };
 
@@ -120,11 +118,6 @@ static const struct enum_list enum_dns_update_settings[] = {
        {DNS_UPDATE_OFF, "Off"},
        {DNS_UPDATE_ON, "nonsecure and secure"},
        {DNS_UPDATE_ON, "nonsecure"},
-       {DNS_UPDATE_ON, "Yes"},
-       {DNS_UPDATE_ON, "True"},
-       {DNS_UPDATE_ON, "1"},
-       {DNS_UPDATE_ON, "On"},
-       {DNS_UPDATE_ON, "enabled"},
        {DNS_UPDATE_SIGNED, "secure only"},
        {DNS_UPDATE_SIGNED, "secure"},
        {DNS_UPDATE_SIGNED, "signed"},
@@ -180,16 +173,6 @@ static const struct enum_list enum_kerberos_method[] = {
        {-1, NULL}
 };
 
-
-/* ACL compatibility options. */
-static const struct enum_list enum_acl_compat_vals[] = {
-    { ACL_COMPAT_AUTO, "auto" },
-    { ACL_COMPAT_WINNT, "winnt" },
-    { ACL_COMPAT_WIN2K, "win2k" },
-    { -1, NULL}
-};
-
-
 static const struct enum_list enum_printing[] = {
        {PRINT_SYSV, "sysv"},
        {PRINT_AIX, "aix"},
@@ -956,24 +939,6 @@ static struct parm_struct parm_table[] = {
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
        },
-       {
-               .label          = "security mask",
-               .type           = P_OCTAL,
-               .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(iSecurity_mask),
-               .special        = NULL,
-               .enum_list      = NULL,
-               .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
-       },
-       {
-               .label          = "force security mode",
-               .type           = P_OCTAL,
-               .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(iSecurity_force_mode),
-               .special        = NULL,
-               .enum_list      = NULL,
-               .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
-       },
        {
                .label          = "directory mask",
                .type           = P_OCTAL,
@@ -1001,24 +966,6 @@ static struct parm_struct parm_table[] = {
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
        },
-       {
-               .label          = "directory security mask",
-               .type           = P_OCTAL,
-               .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(iDir_Security_mask),
-               .special        = NULL,
-               .enum_list      = NULL,
-               .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
-       },
-       {
-               .label          = "force directory security mode",
-               .type           = P_OCTAL,
-               .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(iDir_Security_force_mode),
-               .special        = NULL,
-               .enum_list      = NULL,
-               .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
-       },
        {
                .label          = "force unknown acl user",
                .type           = P_BOOL,
@@ -1494,15 +1441,6 @@ static struct parm_struct parm_table[] = {
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
        },
-       {
-               .label          = "acl compatibility",
-               .type           = P_ENUM,
-               .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(iAclCompat),
-               .special        = NULL,
-               .enum_list      = enum_acl_compat_vals,
-               .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
-       },
        {
                .label          = "defer sharing violations",
                .type           = P_BOOL,
@@ -1949,6 +1887,15 @@ static struct parm_struct parm_table[] = {
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
        },
+       {
+               .label          = "use ntdb",
+               .type           = P_BOOL,
+               .p_class        = P_GLOBAL,
+               .offset         = GLOBAL_VAR(bUseNtdb),
+               .special        = NULL,
+               .enum_list      = NULL,
+               .flags          = FLAG_ADVANCED,
+       },
        {
                .label          = "use sendfile",
                .type           = P_BOOL,
@@ -3771,15 +3718,6 @@ static struct parm_struct parm_table[] = {
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
        },
-       {
-               .label          = "set directory",
-               .type           = P_BOOLREV,
-               .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bNo_set_dir),
-               .special        = NULL,
-               .enum_list      = NULL,
-               .flags          = FLAG_ADVANCED | FLAG_SHARE,
-       },
        {
                .label          = "allow insecure wide links",
                .type           = P_BOOL,
@@ -4260,14 +4198,6 @@ static struct parm_struct parm_table[] = {
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
        },
-       {
-               .label          = "dns recursive queries",
-               .type           = P_BOOL,
-               .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(dns_recursive_queries),
-               .special        = NULL,
-               .enum_list      = NULL
-       },
        {
                .label          = "dns update command",
                .type           = P_CMDLIST,