param: don't list '-valid' and 'copy' as synonyms - they aren't

[garming/samba-autobuild/.git] / lib / param / param_table.c

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 78ea80b36e81bd9a01a11a82222691ee3b6dc24e..cefc6ce8118b5acca9adb0082d3992f5ebe608f6 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -40,7 +40,7 @@
 static const struct enum_list enum_protocol[] = {
        {PROTOCOL_DEFAULT, "default"}, /* the caller decides what this means */
        {PROTOCOL_SMB2_10, "SMB2"}, /* for now keep PROTOCOL_SMB2_10 */
-       {PROTOCOL_SMB3_02, "SMB3"}, /* for now keep PROTOCOL_SMB3_02 */
+       {PROTOCOL_SMB3_11, "SMB3"}, /* for now keep PROTOCOL_SMB3_11 */
        {PROTOCOL_SMB3_11, "SMB3_11"},
        {PROTOCOL_SMB3_10, "SMB3_10"},
        {PROTOCOL_SMB3_02, "SMB3_02"},
@@ -115,6 +115,7 @@ static const struct enum_list enum_smb_signing_vals[] = {
        {SMB_SIGNING_IF_REQUIRED, "On"},
        {SMB_SIGNING_IF_REQUIRED, "enabled"},
        {SMB_SIGNING_IF_REQUIRED, "auto"},
+       {SMB_SIGNING_DESIRED, "desired"},
        {SMB_SIGNING_REQUIRED, "required"},
        {SMB_SIGNING_REQUIRED, "mandatory"},
        {SMB_SIGNING_REQUIRED, "force"},
@@ -336,7 +337,7 @@ struct parm_struct parm_table[] = {
                .label          = "realm",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(realm_original),
+               .offset         = GLOBAL_VAR(realm),
                .special        = handle_realm,
                .enum_list      = NULL,
        },
@@ -797,6 +798,7 @@ struct parm_struct parm_table[] = {
                .offset         = LOCAL_VAR(force_group),
                .special        = NULL,
                .enum_list      = NULL,
+               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "read only",
@@ -806,6 +808,14 @@ struct parm_struct parm_table[] = {
                .special        = NULL,
                .enum_list      = NULL,
        },
+       {
+               .label          = "spotlight",
+               .type           = P_BOOL,
+               .p_class        = P_LOCAL,
+               .offset         = LOCAL_VAR(spotlight),
+               .special        = NULL,
+               .enum_list      = NULL,
+       },
        {
                .label          = "write ok",
                .type           = P_BOOLREV,
@@ -907,6 +917,7 @@ struct parm_struct parm_table[] = {
                .offset         = LOCAL_VAR(directory_mask),
                .special        = NULL,
                .enum_list      = NULL,
+               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "force directory mode",
@@ -1132,6 +1143,7 @@ struct parm_struct parm_table[] = {
                .offset         = GLOBAL_VAR(timestamp_logs),
                .special        = NULL,
                .enum_list      = NULL,
+               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "timestamp logs",
@@ -1252,6 +1264,7 @@ struct parm_struct parm_table[] = {
                .offset         = GLOBAL_VAR(server_max_protocol),
                .special        = NULL,
                .enum_list      = enum_protocol,
+               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "protocol",
@@ -1260,6 +1273,7 @@ struct parm_struct parm_table[] = {
                .offset         = GLOBAL_VAR(server_max_protocol),
                .special        = NULL,
                .enum_list      = enum_protocol,
+               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "server min protocol",
@@ -1276,6 +1290,7 @@ struct parm_struct parm_table[] = {
                .offset         = GLOBAL_VAR(server_min_protocol),
                .special        = NULL,
                .enum_list      = enum_protocol,
+               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "client max protocol",
@@ -1305,7 +1320,7 @@ struct parm_struct parm_table[] = {
                .label          = "min receivefile size",
                .type           = P_BYTES,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(iminreceivefile),
+               .offset         = GLOBAL_VAR(min_receivefile_size),
                .special        = NULL,
                .enum_list      = NULL,
        },
@@ -1651,8 +1666,8 @@ struct parm_struct parm_table[] = {
        {
                .label          = "change notify",
                .type           = P_BOOL,
-               .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(change_notify),
+               .p_class        = P_GLOBAL,
+               .offset         = GLOBAL_VAR(change_notify),
                .special        = NULL,
                .enum_list      = NULL,
        },
@@ -1667,8 +1682,8 @@ struct parm_struct parm_table[] = {
        {
                .label          = "kernel change notify",
                .type           = P_BOOL,
-               .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(kernel_change_notify),
+               .p_class        = P_GLOBAL,
+               .offset         = GLOBAL_VAR(kernel_change_notify),
                .special        = NULL,
                .enum_list      = NULL,
        },
@@ -1868,8 +1883,8 @@ struct parm_struct parm_table[] = {
                .label          = "smb2 max credits",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(ismb2_max_credits),
-               .special        = NULL,
+               .offset         = GLOBAL_VAR(smb2_max_credits),
+               .special        = handle_smb2_max_credits,
                .enum_list      = NULL,
        },
        {
@@ -1884,7 +1899,7 @@ struct parm_struct parm_table[] = {
                .label          = "max print jobs",
                .type           = P_INTEGER,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(iMaxPrintJobs),
+               .offset         = LOCAL_VAR(max_print_jobs),
                .special        = NULL,
                .enum_list      = NULL,
        },
@@ -1908,7 +1923,7 @@ struct parm_struct parm_table[] = {
                .label          = "printcap name",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szPrintcapname),
+               .offset         = GLOBAL_VAR(printcap_name),
                .special        = NULL,
                .enum_list      = NULL,
        },
@@ -1916,7 +1931,7 @@ struct parm_struct parm_table[] = {
                .label          = "printcap",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szPrintcapname),
+               .offset         = GLOBAL_VAR(printcap_name),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_SYNONYM,
@@ -1974,7 +1989,7 @@ struct parm_struct parm_table[] = {
                .label          = "cups encrypt",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(CupsEncrypt),
+               .offset         = GLOBAL_VAR(cups_encrypt),
                .special        = NULL,
                .enum_list      = enum_bool_auto,
        },
@@ -2567,7 +2582,7 @@ struct parm_struct parm_table[] = {
                .label          = "preferred master",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(iPreferredMaster),
+               .offset         = GLOBAL_VAR(_preferred_master),
                .special        = NULL,
                .enum_list      = enum_bool_auto,
        },
@@ -2575,7 +2590,7 @@ struct parm_struct parm_table[] = {
                .label          = "prefered master",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(iPreferredMaster),
+               .offset         = GLOBAL_VAR(_preferred_master),
                .special        = NULL,
                .enum_list      = enum_bool_auto,
                .flags          = FLAG_SYNONYM,
@@ -2809,7 +2824,7 @@ struct parm_struct parm_table[] = {
                .label          = "ldap group suffix",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szLdapGroupSuffix),
+               .offset         = GLOBAL_VAR(_ldap_group_suffix),
                .special        = NULL,
                .enum_list      = NULL,
        },
@@ -2817,7 +2832,7 @@ struct parm_struct parm_table[] = {
                .label          = "ldap idmap suffix",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szLdapIdmapSuffix),
+               .offset         = GLOBAL_VAR(_ldap_idmap_suffix),
                .special        = NULL,
                .enum_list      = NULL,
        },
@@ -2825,7 +2840,7 @@ struct parm_struct parm_table[] = {
                .label          = "ldap machine suffix",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szLdapMachineSuffix),
+               .offset         = GLOBAL_VAR(_ldap_machine_suffix),
                .special        = NULL,
                .enum_list      = NULL,
        },
@@ -2922,7 +2937,7 @@ struct parm_struct parm_table[] = {
                .label          = "ldap user suffix",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szLdapUserSuffix),
+               .offset         = GLOBAL_VAR(_ldap_user_suffix),
                .special        = NULL,
                .enum_list      = NULL,
        },
@@ -2989,6 +3004,7 @@ struct parm_struct parm_table[] = {
                .offset         = GLOBAL_VAR(auto_services),
                .special        = NULL,
                .enum_list      = NULL,
+               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "auto services",
@@ -3089,6 +3105,7 @@ struct parm_struct parm_table[] = {
                .offset         = GLOBAL_VAR(defaultservice),
                .special        = NULL,
                .enum_list      = NULL,
+               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "message command",
@@ -3162,7 +3179,7 @@ struct parm_struct parm_table[] = {
                .offset         = GLOBAL_VAR(nbt_client_socket_address),
                .special        = NULL,
                .enum_list      = NULL,
-               .flags          = FLAG_DEPRECATED,
+               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "nmbd bind explicit broadcast",
@@ -3219,22 +3236,20 @@ struct parm_struct parm_table[] = {
                .offset         = LOCAL_VAR(valid),
                .special        = NULL,
                .enum_list      = NULL,
-               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "copy",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szCopy),
+               .offset         = LOCAL_VAR(copy),
                .special        = handle_copy,
                .enum_list      = NULL,
-               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "include",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szInclude),
+               .offset         = LOCAL_VAR(include),
                .special        = handle_include,
                .enum_list      = NULL,
        },
@@ -3253,6 +3268,7 @@ struct parm_struct parm_table[] = {
                .offset         = LOCAL_VAR(preexec),
                .special        = NULL,
                .enum_list      = NULL,
+               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "preexec close",
@@ -3298,7 +3314,7 @@ struct parm_struct parm_table[] = {
                .label          = "available",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bAvailable),
+               .offset         = LOCAL_VAR(available),
                .special        = NULL,
                .enum_list      = NULL,
        },
@@ -3394,7 +3410,7 @@ struct parm_struct parm_table[] = {
                .label          = "wide links",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bWidelinks),
+               .offset         = LOCAL_VAR(wide_links),
                .special        = NULL,
                .enum_list      = NULL,
        },
@@ -3555,7 +3571,7 @@ struct parm_struct parm_table[] = {
                .label          = "idmap backend",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szIdmapBackend),
+               .offset         = GLOBAL_VAR(idmap_backend),
                .special        = handle_idmap_backend,
                .enum_list      = NULL,
                .flags          = FLAG_DEPRECATED,
@@ -3580,7 +3596,7 @@ struct parm_struct parm_table[] = {
                .label          = "idmap uid",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szIdmapUID),
+               .offset         = GLOBAL_VAR(idmap_uid),
                .special        = handle_idmap_uid,
                .enum_list      = NULL,
                .flags          = FLAG_DEPRECATED,
@@ -3589,7 +3605,7 @@ struct parm_struct parm_table[] = {
                .label          = "winbind uid",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szIdmapUID),
+               .offset         = GLOBAL_VAR(idmap_uid),
                .special        = handle_idmap_uid,
                .enum_list      = NULL,
                .flags          = FLAG_SYNONYM,
@@ -3598,7 +3614,7 @@ struct parm_struct parm_table[] = {
                .label          = "idmap gid",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szIdmapGID),
+               .offset         = GLOBAL_VAR(idmap_gid),
                .special        = handle_idmap_gid,
                .enum_list      = NULL,
                .flags          = FLAG_DEPRECATED,
@@ -3607,7 +3623,7 @@ struct parm_struct parm_table[] = {
                .label          = "winbind gid",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szIdmapGID),
+               .offset         = GLOBAL_VAR(idmap_gid),
                .special        = handle_idmap_gid,
                .enum_list      = NULL,
                .flags          = FLAG_SYNONYM,
@@ -3776,7 +3792,7 @@ struct parm_struct parm_table[] = {
                .label          = "winbind max domain connections",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(winbindMaxDomainConnections),
+               .offset         = GLOBAL_VAR(_winbind_max_domain_connections),
                .special        = NULL,
                .enum_list      = NULL,
        },
@@ -3988,6 +4004,14 @@ struct parm_struct parm_table[] = {
                .special        = NULL,
                .enum_list      = NULL
        },
+       {
+               .label          = "tls priority",
+               .type           = P_STRING,
+               .p_class        = P_GLOBAL,
+               .offset         = GLOBAL_VAR(tls_priority),
+               .special        = NULL,
+               .enum_list      = NULL
+       },
 
        {NULL,  P_BOOL,  P_NONE,  0,  NULL,  NULL,  0}
 };