X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=lib%2Fparam%2Fparam_table.c;h=82fad33443ee8f9f2a531c63db560ccb4696a6be;hb=fe9974ca45ec6d9a43d70cea3bd28243e43f785e;hp=bd94553f8bdfeac12ab7dbe8b89f78a80ddc0da3;hpb=64dc4b59f880b190a347f33dbcb40e0d65a8e009;p=kai%2Fsamba-autobuild%2F.git

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index bd94553f8bd..82fad33443e 100644
--- 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,
@@ -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,
@@ -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,
@@ -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,