param: Rename variable used for lp_print_notify_backchannel bPrintNotifyBackchannel

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

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index dcd8f3efd225eee677d6773c6e25b94faa25bc41..154c82c688aa7fafad49476035959e4878c2401a 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -656,7 +656,7 @@ static struct parm_struct parm_table[] = {
                .label          = "username map",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szUsernameMap),
+               .offset         = GLOBAL_VAR(usernameMap),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -746,7 +746,7 @@ static struct parm_struct parm_table[] = {
                .label          = "username",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szUsername),
+               .offset         = LOCAL_VAR(username),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE | FLAG_DEPRECATED,
@@ -755,7 +755,7 @@ static struct parm_struct parm_table[] = {
                .label          = "user",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szUsername),
+               .offset         = LOCAL_VAR(username),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -764,7 +764,7 @@ static struct parm_struct parm_table[] = {
                .label          = "users",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szUsername),
+               .offset         = LOCAL_VAR(username),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -773,7 +773,7 @@ static struct parm_struct parm_table[] = {
                .label          = "invalid users",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szInvalidUsers),
+               .offset         = LOCAL_VAR(invalid_users),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -782,7 +782,7 @@ static struct parm_struct parm_table[] = {
                .label          = "valid users",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szValidUsers),
+               .offset         = LOCAL_VAR(valid_users),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -791,7 +791,7 @@ static struct parm_struct parm_table[] = {
                .label          = "admin users",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szAdminUsers),
+               .offset         = LOCAL_VAR(admin_users),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -845,7 +845,7 @@ static struct parm_struct parm_table[] = {
                .label          = "read only",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bRead_only),
+               .offset         = LOCAL_VAR(readonly),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE,
@@ -854,7 +854,7 @@ static struct parm_struct parm_table[] = {
                .label          = "write ok",
                .type           = P_BOOLREV,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bRead_only),
+               .offset         = LOCAL_VAR(readonly),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -863,7 +863,7 @@ static struct parm_struct parm_table[] = {
                .label          = "writeable",
                .type           = P_BOOLREV,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bRead_only),
+               .offset         = LOCAL_VAR(readonly),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -872,7 +872,7 @@ static struct parm_struct parm_table[] = {
                .label          = "writable",
                .type           = P_BOOLREV,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bRead_only),
+               .offset         = LOCAL_VAR(readonly),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -918,7 +918,7 @@ static struct parm_struct parm_table[] = {
                .label          = "create mask",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(iCreate_mask),
+               .offset         = LOCAL_VAR(create_mask),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -927,7 +927,7 @@ static struct parm_struct parm_table[] = {
                .label          = "create mode",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(iCreate_mask),
+               .offset         = LOCAL_VAR(create_mask),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -936,7 +936,7 @@ static struct parm_struct parm_table[] = {
                .label          = "force create mode",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(iCreate_force_mode),
+               .offset         = LOCAL_VAR(force_create_mode),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -945,7 +945,7 @@ static struct parm_struct parm_table[] = {
                .label          = "directory mask",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(iDir_mask),
+               .offset         = LOCAL_VAR(dir_mask),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -954,7 +954,7 @@ static struct parm_struct parm_table[] = {
                .label          = "directory mode",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(iDir_mask),
+               .offset         = LOCAL_VAR(dir_mask),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
@@ -963,7 +963,7 @@ static struct parm_struct parm_table[] = {
                .label          = "force directory mode",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(iDir_force_mode),
+               .offset         = LOCAL_VAR(force_dir_mode),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1008,7 +1008,7 @@ static struct parm_struct parm_table[] = {
                .label          = "guest only",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bGuest_only),
+               .offset         = LOCAL_VAR(guest_only),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -1017,7 +1017,7 @@ static struct parm_struct parm_table[] = {
                .label          = "only guest",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bGuest_only),
+               .offset         = LOCAL_VAR(guest_only),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1026,7 +1026,7 @@ static struct parm_struct parm_table[] = {
                .label          = "administrative share",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bAdministrative_share),
+               .offset         = LOCAL_VAR(administrative_share),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -1036,7 +1036,7 @@ static struct parm_struct parm_table[] = {
                .label          = "guest ok",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bGuest_ok),
+               .offset         = LOCAL_VAR(guest_ok),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -1045,7 +1045,7 @@ static struct parm_struct parm_table[] = {
                .label          = "public",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bGuest_ok),
+               .offset         = LOCAL_VAR(guest_ok),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1063,7 +1063,7 @@ static struct parm_struct parm_table[] = {
                .label          = "hosts allow",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szHostsallow),
+               .offset         = LOCAL_VAR(hostsallow),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_GLOBAL | FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -1072,7 +1072,7 @@ static struct parm_struct parm_table[] = {
                .label          = "allow hosts",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szHostsallow),
+               .offset         = LOCAL_VAR(hostsallow),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1081,7 +1081,7 @@ static struct parm_struct parm_table[] = {
                .label          = "hosts deny",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szHostsdeny),
+               .offset         = LOCAL_VAR(hostsdeny),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_GLOBAL | FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -1090,7 +1090,7 @@ static struct parm_struct parm_table[] = {
                .label          = "deny hosts",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szHostsdeny),
+               .offset         = LOCAL_VAR(hostsdeny),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1295,7 +1295,7 @@ static struct parm_struct parm_table[] = {
                .label          = "aio write behind",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szAioWriteBehind),
+               .offset         = LOCAL_VAR(aio_write_behind),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -1812,7 +1812,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max connections",
                .type           = P_INTEGER,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(iMaxConnections),
+               .offset         = LOCAL_VAR(max_connections),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -1866,7 +1866,7 @@ static struct parm_struct parm_table[] = {
                .label          = "strict sync",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bStrictSync),
+               .offset         = LOCAL_VAR(strict_sync),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -2076,7 +2076,7 @@ static struct parm_struct parm_table[] = {
                .label          = "printable",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bPrint_ok),
+               .offset         = LOCAL_VAR(print_ok),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -2085,7 +2085,7 @@ static struct parm_struct parm_table[] = {
                .label          = "print notify backchannel",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bPrintNotifyBackchannel),
+               .offset         = LOCAL_VAR(print_notify_backchannel),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2094,7 +2094,7 @@ static struct parm_struct parm_table[] = {
                .label          = "print ok",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bPrint_ok),
+               .offset         = LOCAL_VAR(print_ok),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -2158,7 +2158,7 @@ static struct parm_struct parm_table[] = {
                .label          = "print command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szPrintcommand),
+               .offset         = LOCAL_VAR(printcommand),
                .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(szLpqcommand),
+               .offset         = LOCAL_VAR(lpqcommand),
                .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(szLprmcommand),
+               .offset         = LOCAL_VAR(lprmcommand),
                .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(szLppausecommand),
+               .offset         = LOCAL_VAR(lppausecommand),
                .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(szLpresumecommand),
+               .offset         = LOCAL_VAR(lpresumecommand),
                .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(szQueuepausecommand),
+               .offset         = LOCAL_VAR(queuepausecommand),
                .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(szQueueresumecommand),
+               .offset         = LOCAL_VAR(queueresumecommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2339,7 +2339,7 @@ static struct parm_struct parm_table[] = {
                .label          = "printjob username",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szPrintjobUsername),
+               .offset         = LOCAL_VAR(printjob_username),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -2379,7 +2379,7 @@ static struct parm_struct parm_table[] = {
                .label          = "case sensitive",
                .type           = P_ENUM,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(iCaseSensitive),
+               .offset         = LOCAL_VAR(casesensitive),
                .special        = NULL,
                .enum_list      = enum_bool_auto,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2388,7 +2388,7 @@ static struct parm_struct parm_table[] = {
                .label          = "casesignames",
                .type           = P_ENUM,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(iCaseSensitive),
+               .offset         = LOCAL_VAR(casesensitive),
                .special        = NULL,
                .enum_list      = enum_bool_auto,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL | FLAG_HIDE,
@@ -2397,7 +2397,7 @@ static struct parm_struct parm_table[] = {
                .label          = "preserve case",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bCasePreserve),
+               .offset         = LOCAL_VAR(preservecase),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2406,7 +2406,7 @@ static struct parm_struct parm_table[] = {
                .label          = "short preserve case",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bShortCasePreserve),
+               .offset         = LOCAL_VAR(shortpreservecase),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2424,7 +2424,7 @@ static struct parm_struct parm_table[] = {
                .label          = "hide dot files",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bHideDotFiles),
+               .offset         = LOCAL_VAR(hide_dot_files),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2433,7 +2433,7 @@ static struct parm_struct parm_table[] = {
                .label          = "hide special files",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bHideSpecialFiles),
+               .offset         = LOCAL_VAR(hide_special_files),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2442,7 +2442,7 @@ static struct parm_struct parm_table[] = {
                .label          = "hide unreadable",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bHideUnReadable),
+               .offset         = LOCAL_VAR(hideunreadable),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2451,7 +2451,7 @@ static struct parm_struct parm_table[] = {
                .label          = "hide unwriteable files",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bHideUnWriteableFiles),
+               .offset         = LOCAL_VAR(hideunwriteable_files),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2469,7 +2469,7 @@ static struct parm_struct parm_table[] = {
                .label          = "veto files",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szVetoFiles),
+               .offset         = LOCAL_VAR(veto_files),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2478,7 +2478,7 @@ static struct parm_struct parm_table[] = {
                .label          = "hide files",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szHideFiles),
+               .offset         = LOCAL_VAR(hide_files),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2487,7 +2487,7 @@ static struct parm_struct parm_table[] = {
                .label          = "veto oplock files",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szVetoOplockFiles),
+               .offset         = LOCAL_VAR(veto_oplocks),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2496,7 +2496,7 @@ static struct parm_struct parm_table[] = {
                .label          = "map archive",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bMap_archive),
+               .offset         = LOCAL_VAR(map_archive),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2505,7 +2505,7 @@ static struct parm_struct parm_table[] = {
                .label          = "map hidden",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bMap_hidden),
+               .offset         = LOCAL_VAR(map_hidden),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2514,7 +2514,7 @@ static struct parm_struct parm_table[] = {
                .label          = "map system",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bMap_system),
+               .offset         = LOCAL_VAR(map_system),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2692,7 +2692,7 @@ static struct parm_struct parm_table[] = {
                .label          = "username map script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szUsernameMapScript),
+               .offset         = GLOBAL_VAR(usernameMapScript),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2851,7 +2851,7 @@ static struct parm_struct parm_table[] = {
                .label          = "browseable",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bBrowseable),
+               .offset         = LOCAL_VAR(browseable),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -2860,7 +2860,7 @@ static struct parm_struct parm_table[] = {
                .label          = "browsable",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bBrowseable),
+               .offset         = LOCAL_VAR(browseable),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -2869,7 +2869,7 @@ static struct parm_struct parm_table[] = {
                .label          = "access based share enum",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bAccessBasedShareEnum),
+               .offset         = LOCAL_VAR(access_based_share_enum),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE
@@ -2947,7 +2947,7 @@ static struct parm_struct parm_table[] = {
                .label          = "csc policy",
                .type           = P_ENUM,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(iCSCPolicy),
+               .offset         = LOCAL_VAR(csc_policy),
                .special        = NULL,
                .enum_list      = enum_csc_policy,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3001,7 +3001,7 @@ static struct parm_struct parm_table[] = {
                .label          = "oplocks",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bOpLocks),
+               .offset         = LOCAL_VAR(oplocks),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3418,7 +3418,7 @@ static struct parm_struct parm_table[] = {
                .label          = "dfree command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szDfree),
+               .offset         = LOCAL_VAR(dfree_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3562,7 +3562,7 @@ static struct parm_struct parm_table[] = {
                .label          = "preexec",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szPreExec),
+               .offset         = LOCAL_VAR(preexec),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -3571,7 +3571,7 @@ static struct parm_struct parm_table[] = {
                .label          = "exec",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szPreExec),
+               .offset         = LOCAL_VAR(preexec),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3580,7 +3580,7 @@ static struct parm_struct parm_table[] = {
                .label          = "preexec close",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bPreexecClose),
+               .offset         = LOCAL_VAR(preexec_close),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -3589,7 +3589,7 @@ static struct parm_struct parm_table[] = {
                .label          = "postexec",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szPostExec),
+               .offset         = LOCAL_VAR(postexec),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -3598,7 +3598,7 @@ static struct parm_struct parm_table[] = {
                .label          = "root preexec",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szRootPreExec),
+               .offset         = LOCAL_VAR(rootpreexec),
                .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(bRootpreexecClose),
+               .offset         = LOCAL_VAR(rootpreexec_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(szRootPostExec),
+               .offset         = LOCAL_VAR(rootpostexec),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -3751,7 +3751,7 @@ static struct parm_struct parm_table[] = {
                .label          = "dont descend",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szDontdescend),
+               .offset         = LOCAL_VAR(dontdescend),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -3760,7 +3760,7 @@ static struct parm_struct parm_table[] = {
                .label          = "magic script",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szMagicScript),
+               .offset         = LOCAL_VAR(magicscript),
                .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(szMagicOutput),
+               .offset         = LOCAL_VAR(magicoutput),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -3853,7 +3853,7 @@ static struct parm_struct parm_table[] = {
                .label          = "vfs objects",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szVfsObjects),
+               .offset         = LOCAL_VAR(vfs_objects),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -3862,7 +3862,7 @@ static struct parm_struct parm_table[] = {
                .label          = "vfs object",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szVfsObjects),
+               .offset         = LOCAL_VAR(vfs_objects),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -3875,7 +3875,7 @@ static struct parm_struct parm_table[] = {
                .label          = "msdfs root",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bMSDfsRoot),
+               .offset         = LOCAL_VAR(msdfs_root),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -3884,7 +3884,7 @@ static struct parm_struct parm_table[] = {
                .label          = "msdfs proxy",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szMSDfsProxy),
+               .offset         = LOCAL_VAR(msdfs_proxy),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,