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 c4306280ded8095254b6ff8f9b00215cfed45a10..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,
@@ -1322,7 +1322,7 @@ static struct parm_struct parm_table[] = {
                .label          = "server max protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(srv_maxprotocol),
+               .offset         = GLOBAL_VAR(server_max_protocol),
                .special        = NULL,
                .enum_list      = enum_protocol,
                .flags          = FLAG_ADVANCED,
@@ -1331,7 +1331,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(srv_maxprotocol),
+               .offset         = GLOBAL_VAR(server_max_protocol),
                .special        = NULL,
                .enum_list      = enum_protocol,
                .flags          = FLAG_ADVANCED,
@@ -1340,7 +1340,7 @@ static struct parm_struct parm_table[] = {
                .label          = "protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(srv_maxprotocol),
+               .offset         = GLOBAL_VAR(server_max_protocol),
                .special        = NULL,
                .enum_list      = enum_protocol,
                .flags          = FLAG_ADVANCED,
@@ -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,
@@ -1367,7 +1367,7 @@ static struct parm_struct parm_table[] = {
                .label          = "client max protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(cli_maxprotocol),
+               .offset         = GLOBAL_VAR(client_max_protocol),
                .special        = NULL,
                .enum_list      = enum_protocol,
                .flags          = FLAG_ADVANCED,
@@ -1376,7 +1376,7 @@ static struct parm_struct parm_table[] = {
                .label          = "client min protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(cli_minprotocol),
+               .offset         = GLOBAL_VAR(client_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,
@@ -1519,7 +1519,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max mux",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(maxmux),
+               .offset         = GLOBAL_VAR(max_mux),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1794,7 +1794,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lpq cache time",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(lpqcachetime),
+               .offset         = GLOBAL_VAR(lpq_cache_time),
                .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,
@@ -2022,7 +2022,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max reported print jobs",
                .type           = P_INTEGER,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(max_reported_jobs),
+               .offset         = LOCAL_VAR(max_reported_print_jobs),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -2158,7 +2158,7 @@ static struct parm_struct parm_table[] = {
                .label          = "print command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(printcommand),
+               .offset         = LOCAL_VAR(print_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2185,7 +2185,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lpq command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(lpqcommand),
+               .offset         = LOCAL_VAR(lpq_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2194,7 +2194,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lprm command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(lprmcommand),
+               .offset         = LOCAL_VAR(lprm_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2203,7 +2203,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lppause command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(lppausecommand),
+               .offset         = LOCAL_VAR(lppause_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2212,7 +2212,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lpresume command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(lpresumecommand),
+               .offset         = LOCAL_VAR(lpresume_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2221,7 +2221,7 @@ static struct parm_struct parm_table[] = {
                .label          = "queuepause command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(queuepausecommand),
+               .offset         = LOCAL_VAR(queuepause_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2230,7 +2230,7 @@ static struct parm_struct parm_table[] = {
                .label          = "queueresume command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(queueresumecommand),
+               .offset         = LOCAL_VAR(queueresume_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2239,7 +2239,7 @@ static struct parm_struct parm_table[] = {
                .label          = "addport command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(addport_cmd),
+               .offset         = GLOBAL_VAR(addport_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2248,7 +2248,7 @@ static struct parm_struct parm_table[] = {
                .label          = "enumports command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(enumports_cmd),
+               .offset         = GLOBAL_VAR(enumports_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2257,7 +2257,7 @@ static struct parm_struct parm_table[] = {
                .label          = "addprinter command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(addprinter_cmd),
+               .offset         = GLOBAL_VAR(addprinter_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2266,7 +2266,7 @@ static struct parm_struct parm_table[] = {
                .label          = "deleteprinter command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(deleteprinter_cmd),
+               .offset         = GLOBAL_VAR(deleteprinter_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2275,7 +2275,7 @@ static struct parm_struct parm_table[] = {
                .label          = "show add printer wizard",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(ms_add_printer_wizard),
+               .offset         = GLOBAL_VAR(show_add_printer_wizard),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -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,
@@ -2611,7 +2611,7 @@ static struct parm_struct parm_table[] = {
                .label          = "delete user script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(deluser_script),
+               .offset         = GLOBAL_VAR(delete_user_script),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2647,7 +2647,7 @@ static struct parm_struct parm_table[] = {
                .label          = "delete user from group script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(deluserfromgroup_script),
+               .offset         = GLOBAL_VAR(delete_user_from_group_script),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2656,7 +2656,7 @@ static struct parm_struct parm_table[] = {
                .label          = "set primary group script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(setprimarygroup_script),
+               .offset         = GLOBAL_VAR(set_primary_group_script),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3244,7 +3244,7 @@ static struct parm_struct parm_table[] = {
                .label          = "add share command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(add_share_cmd),
+               .offset         = GLOBAL_VAR(add_share_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3253,7 +3253,7 @@ static struct parm_struct parm_table[] = {
                .label          = "change share command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(change_share_cmd),
+               .offset         = GLOBAL_VAR(change_share_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3262,7 +3262,7 @@ static struct parm_struct parm_table[] = {
                .label          = "delete share command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(delete_share_cmd),
+               .offset         = GLOBAL_VAR(delete_share_command),
                .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,
@@ -3400,7 +3400,7 @@ static struct parm_struct parm_table[] = {
                .label          = "message command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(msg_command),
+               .offset         = GLOBAL_VAR(message_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3490,7 +3490,7 @@ static struct parm_struct parm_table[] = {
                .label          = "homedir map",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(nis_home_map_name),
+               .offset         = GLOBAL_VAR(homedir_map),
                .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,
@@ -3598,7 +3598,7 @@ static struct parm_struct parm_table[] = {
                .label          = "root preexec",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(rootpreexec),
+               .offset         = LOCAL_VAR(root_preexec),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -3607,7 +3607,7 @@ static struct parm_struct parm_table[] = {
                .label          = "root preexec close",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(rootpreexec_close),
+               .offset         = LOCAL_VAR(root_preexec_close),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -3616,7 +3616,7 @@ static struct parm_struct parm_table[] = {
                .label          = "root postexec",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(rootpostexec),
+               .offset         = LOCAL_VAR(root_postexec),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -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,
@@ -3724,7 +3724,7 @@ static struct parm_struct parm_table[] = {
                .label          = "allow insecure wide links",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(allow_insecure_widelinks),
+               .offset         = GLOBAL_VAR(allow_insecure_wide_links),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3742,7 +3742,7 @@ static struct parm_struct parm_table[] = {
                .label          = "follow symlinks",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(symlinks),
+               .offset         = LOCAL_VAR(follow_symlinks),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3760,7 +3760,7 @@ static struct parm_struct parm_table[] = {
                .label          = "magic script",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(magicscript),
+               .offset         = LOCAL_VAR(magic_script),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -3769,7 +3769,7 @@ static struct parm_struct parm_table[] = {
                .label          = "magic output",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(magicoutput),
+               .offset         = LOCAL_VAR(magic_output),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -3814,7 +3814,7 @@ static struct parm_struct parm_table[] = {
                .label          = "fake directory create times",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(fake_dir_create_times),
+               .offset         = LOCAL_VAR(fake_directory_create_times),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,