diff options
author | Michael Adam <obnox@samba.org> | 2015-04-24 09:57:08 +0200 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2015-05-02 00:56:31 +0200 |
commit | e629d390f5ab5d3d74c6e5267f17585916e50950 (patch) | |
tree | c606f818cf097f2b3d62b0079b7e59645d803379 /lib/param | |
parent | 27ddd157ce1e7bb139d18cc8935a1365fd77e309 (diff) | |
download | samba-e629d390f5ab5d3d74c6e5267f17585916e50950.tar.gz |
param: rename FLAG_HIDE to FLAG_SYNONYM
This is what it is used for - detect synonyms.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Ira Cooper <ira@samba.org>
Diffstat (limited to 'lib/param')
-rw-r--r-- | lib/param/loadparm.h | 2 | ||||
-rw-r--r-- | lib/param/param_table.c | 60 |
2 files changed, 31 insertions, 31 deletions
diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index 2be30781215..c762259ba74 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -95,7 +95,7 @@ struct file_lists { }; #define FLAG_DEPRECATED 0x1000 /* options that should no longer be used */ -#define FLAG_HIDE 0x2000 /* options that should be hidden in SWAT */ +#define FLAG_SYNONYM 0x2000 /* options that is a synonym of another option */ #define FLAG_CMDLINE 0x10000 /* option has been overridden */ #define FLAG_DEFAULT 0x20000 /* this option was a default */ diff --git a/lib/param/param_table.c b/lib/param/param_table.c index a4f807dbcdb..eede823273e 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -274,7 +274,7 @@ static const struct enum_list enum_case[] = { * * NOTE: Handling of duplicated (synonym) parameters: * Parameters that are synonymous are stored in the same variable. - * All but the default spelling carry the flag FLAG_HIDE. + * All but the default spelling carry the flag FLAG_SYNONYM. */ #define GLOBAL_VAR(name) offsetof(struct loadparm_global, name) @@ -321,7 +321,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(path), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "workgroup", @@ -515,7 +515,7 @@ struct parm_struct parm_table[] = { .offset = GLOBAL_VAR(private_dir), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "passdb backend", @@ -548,7 +548,7 @@ struct parm_struct parm_table[] = { .offset = GLOBAL_VAR(root_directory), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "root", @@ -557,7 +557,7 @@ struct parm_struct parm_table[] = { .offset = GLOBAL_VAR(root_directory), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "guest account", @@ -722,7 +722,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(username), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "users", @@ -731,7 +731,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(username), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "invalid users", @@ -812,7 +812,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(read_only), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "writeable", @@ -821,7 +821,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(read_only), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "writable", @@ -830,7 +830,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(read_only), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "acl check permissions", @@ -881,7 +881,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(create_mask), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "force create mode", @@ -962,7 +962,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(guest_only), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "administrative share", @@ -988,7 +988,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(guest_ok), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "only user", @@ -1014,7 +1014,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(hosts_allow), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "hosts deny", @@ -1031,7 +1031,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(hosts_deny), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "preload modules", @@ -1080,7 +1080,7 @@ struct parm_struct parm_table[] = { .offset = GLOBAL_VAR(log_level), .special = handle_debug_list, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "syslog", @@ -1918,7 +1918,7 @@ struct parm_struct parm_table[] = { .offset = GLOBAL_VAR(szPrintcapname), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "printable", @@ -1943,7 +1943,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(printable), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "printing", @@ -2017,7 +2017,7 @@ struct parm_struct parm_table[] = { .offset = GLOBAL_VAR(_disable_spoolss), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "lpq command", @@ -2131,7 +2131,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(_printername), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "use client driver", @@ -2205,7 +2205,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(case_sensitive), .special = NULL, .enum_list = enum_bool_auto, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "preserve case", @@ -2577,7 +2577,7 @@ struct parm_struct parm_table[] = { .offset = GLOBAL_VAR(iPreferredMaster), .special = NULL, .enum_list = enum_bool_auto, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "local master", @@ -2618,7 +2618,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(browseable), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "access based share enum", @@ -2843,7 +2843,7 @@ struct parm_struct parm_table[] = { .offset = GLOBAL_VAR(ldap_passwd_sync), .special = NULL, .enum_list = enum_ldap_passwd_sync, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "ldap replication sleep", @@ -3012,7 +3012,7 @@ struct parm_struct parm_table[] = { .offset = GLOBAL_VAR(lock_directory), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "state directory", @@ -3218,7 +3218,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(valid), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "copy", @@ -3227,7 +3227,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(szCopy), .special = handle_copy, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "include", @@ -3508,7 +3508,7 @@ struct parm_struct parm_table[] = { .offset = LOCAL_VAR(vfs_objects), .special = NULL, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "msdfs root", @@ -3591,7 +3591,7 @@ struct parm_struct parm_table[] = { .offset = GLOBAL_VAR(szIdmapUID), .special = handle_idmap_uid, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "idmap gid", @@ -3609,7 +3609,7 @@ struct parm_struct parm_table[] = { .offset = GLOBAL_VAR(szIdmapGID), .special = handle_idmap_gid, .enum_list = NULL, - .flags = FLAG_HIDE, + .flags = FLAG_SYNONYM, }, { .label = "template homedir", |