lib/param: Remove special handling for 'state dir' and 'cache dir'

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

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index bd94553f8bdfeac12ab7dbe8b89f78a80ddc0da3..8dc6183e031f50d3caad74d3621f468e24502ff6 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -439,7 +439,7 @@ static struct parm_struct parm_table[] = {
                .label          = "encrypt passwords",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(encrypted_passwords),
+               .offset         = GLOBAL_VAR(encrypt_passwords),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
@@ -556,7 +556,7 @@ static struct parm_struct parm_table[] = {
                .label          = "root directory",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(rootdir),
+               .offset         = GLOBAL_VAR(root_directory),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -565,7 +565,7 @@ static struct parm_struct parm_table[] = {
                .label          = "root dir",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(rootdir),
+               .offset         = GLOBAL_VAR(root_directory),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -574,7 +574,7 @@ static struct parm_struct parm_table[] = {
                .label          = "root",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(rootdir),
+               .offset         = GLOBAL_VAR(root_directory),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -665,7 +665,7 @@ static struct parm_struct parm_table[] = {
                .label          = "username level",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(usernamelevel),
+               .offset         = GLOBAL_VAR(username_level),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -800,7 +800,7 @@ static struct parm_struct parm_table[] = {
                .label          = "read list",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(readlist),
+               .offset         = LOCAL_VAR(read_list),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -809,7 +809,7 @@ static struct parm_struct parm_table[] = {
                .label          = "write list",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(writelist),
+               .offset         = LOCAL_VAR(write_list),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -981,7 +981,7 @@ static struct parm_struct parm_table[] = {
                .label          = "inherit permissions",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(inherit_perms),
+               .offset         = LOCAL_VAR(inherit_permissions),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -1054,7 +1054,7 @@ static struct parm_struct parm_table[] = {
                .label          = "only user",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(onlyuser),
+               .offset         = LOCAL_VAR(only_user),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_DEPRECATED,
@@ -1139,7 +1139,7 @@ static struct parm_struct parm_table[] = {
                .label          = "log level",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(loglevel),
+               .offset         = GLOBAL_VAR(log_level),
                .special        = handle_debug_list,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1148,7 +1148,7 @@ static struct parm_struct parm_table[] = {
                .label          = "debuglevel",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(loglevel),
+               .offset         = GLOBAL_VAR(log_level),
                .special        = handle_debug_list,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1349,7 +1349,7 @@ static struct parm_struct parm_table[] = {
                .label          = "server min protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(srv_minprotocol),
+               .offset         = GLOBAL_VAR(server_min_protocol),
                .special        = NULL,
                .enum_list      = enum_protocol,
                .flags          = FLAG_ADVANCED,
@@ -1358,7 +1358,7 @@ static struct parm_struct parm_table[] = {
                .label          = "min protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(srv_minprotocol),
+               .offset         = GLOBAL_VAR(server_min_protocol),
                .special        = NULL,
                .enum_list      = enum_protocol,
                .flags          = FLAG_ADVANCED,
@@ -1402,7 +1402,7 @@ static struct parm_struct parm_table[] = {
                .label          = "read raw",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(bReadRaw),
+               .offset         = GLOBAL_VAR(read_raw),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1411,7 +1411,7 @@ static struct parm_struct parm_table[] = {
                .label          = "write raw",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(bWriteRaw),
+               .offset         = GLOBAL_VAR(write_raw),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1821,7 +1821,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max disk size",
                .type           = P_BYTES,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(maxdisksize),
+               .offset         = GLOBAL_VAR(max_disk_size),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1839,7 +1839,7 @@ static struct parm_struct parm_table[] = {
                .label          = "min print space",
                .type           = P_INTEGER,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(minprintspace),
+               .offset         = LOCAL_VAR(min_print_space),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -1875,7 +1875,7 @@ static struct parm_struct parm_table[] = {
                .label          = "sync always",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(syncalways),
+               .offset         = LOCAL_VAR(sync_always),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -2602,7 +2602,7 @@ static struct parm_struct parm_table[] = {
                .label          = "rename user script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(renameuser_script),
+               .offset         = GLOBAL_VAR(rename_user_script),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3316,7 +3316,7 @@ static struct parm_struct parm_table[] = {
                .label          = "state directory",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szStateDir),
+               .offset         = GLOBAL_VAR(state_directory),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3325,7 +3325,7 @@ static struct parm_struct parm_table[] = {
                .label          = "cache directory",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szCacheDir),
+               .offset         = GLOBAL_VAR(cache_directory),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3526,7 +3526,7 @@ static struct parm_struct parm_table[] = {
                .label          = "NIS homedir",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(nis_home_map),
+               .offset         = GLOBAL_VAR(nis_homedir),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3697,7 +3697,7 @@ static struct parm_struct parm_table[] = {
                .label          = "usershare template share",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szUsershareTemplateShare),
+               .offset         = GLOBAL_VAR(usershare_template_share),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,