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 eb28e9f254e51a995e28331615f89f9a41846ee5..cefc6ce8118b5acca9adb0082d3992f5ebe608f6 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -798,6 +798,7 @@ struct parm_struct parm_table[] = {
                .offset         = LOCAL_VAR(force_group),
                .special        = NULL,
                .enum_list      = NULL,
+               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "read only",
@@ -916,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",
@@ -1141,6 +1143,7 @@ struct parm_struct parm_table[] = {
                .offset         = GLOBAL_VAR(timestamp_logs),
                .special        = NULL,
                .enum_list      = NULL,
+               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "timestamp logs",
@@ -1261,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",
@@ -1269,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",
@@ -1285,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",
@@ -2998,6 +3004,7 @@ struct parm_struct parm_table[] = {
                .offset         = GLOBAL_VAR(auto_services),
                .special        = NULL,
                .enum_list      = NULL,
+               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "auto services",
@@ -3098,6 +3105,7 @@ struct parm_struct parm_table[] = {
                .offset         = GLOBAL_VAR(defaultservice),
                .special        = NULL,
                .enum_list      = NULL,
+               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "message command",
@@ -3171,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",
@@ -3228,7 +3236,6 @@ struct parm_struct parm_table[] = {
                .offset         = LOCAL_VAR(valid),
                .special        = NULL,
                .enum_list      = NULL,
-               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "copy",
@@ -3237,7 +3244,6 @@ struct parm_struct parm_table[] = {
                .offset         = LOCAL_VAR(copy),
                .special        = handle_copy,
                .enum_list      = NULL,
-               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "include",
@@ -3262,6 +3268,7 @@ struct parm_struct parm_table[] = {
                .offset         = LOCAL_VAR(preexec),
                .special        = NULL,
                .enum_list      = NULL,
+               .flags          = FLAG_SYNONYM,
        },
        {
                .label          = "preexec close",
@@ -3607,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,
@@ -3616,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,