sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

param: remove swat specific flags.

Browse Source 
The flags FLAG_BASIC, FLAG_SHARE, FLAG_PRINT, FLAG_GLOBAL
FLAG_WIZARD, FLAG_ADVANCED, FLAG_DEVELOPER, FLAG_META
were only used in swat. Remove these, since swat does
no longer exist.

Flags FLAG_DEPRECATED, FLAG_DEFAULT, FLAG_HIDE are used and hence kept.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Ira Cooper <ira@samba.org>
This commit is contained in:
Michael Adam 2015-04-24 09:36:05 +02:00
parent 8489543e66
commit 27ddd157ce
3 changed files with 20 additions and 439 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/param/loadparm.h
View File

@ -94,17 +94,8 @@ struct file_lists {
time_t modtime;
};
/* The following flags are used in SWAT */
#define FLAG_BASIC 0x0001 /* Display only in BASIC view */
#define FLAG_SHARE 0x0002 /* file sharing options */
#define FLAG_PRINT 0x0004 /* printing options */
#define FLAG_GLOBAL 0x0008 /* local options that should be globally settable in SWAT */
#define FLAG_WIZARD 0x0010 /* Parameters that the wizard will operate on */
#define FLAG_ADVANCED 0x0020 /* Parameters that will be visible in advanced view */
#define FLAG_DEVELOPER 0x0040 /* No longer used */
#define FLAG_DEPRECATED 0x1000 /* options that should no longer be used */
#define FLAG_HIDE 0x2000 /* options that should be hidden in SWAT */
#define FLAG_META 0x8000 /* A meta directive - not a real parameter */
#define FLAG_CMDLINE 0x10000 /* option has been overridden */
#define FLAG_DEFAULT 0x20000 /* this option was a default */

442
lib/param/param_table.c
View File

File diff suppressed because it is too large Load Diff

8
source3/param/loadparm.c
View File

@ -1714,12 +1714,8 @@ static void show_parameter(int parmIndex)
const char *type[] = { "P_BOOL", "P_BOOLREV", "P_CHAR", "P_INTEGER",
"P_OCTAL", "P_LIST", "P_STRING", "P_USTRING",
"P_ENUM" };
unsigned flags[] = { FLAG_BASIC, FLAG_SHARE, FLAG_PRINT, FLAG_GLOBAL,
FLAG_WIZARD, FLAG_ADVANCED, FLAG_DEVELOPER, FLAG_DEPRECATED,
FLAG_HIDE};
const char *flag_names[] = { "FLAG_BASIC", "FLAG_SHARE", "FLAG_PRINT",
"FLAG_GLOBAL", "FLAG_WIZARD", "FLAG_ADVANCED", "FLAG_DEVELOPER",
"FLAG_DEPRECATED", "FLAG_HIDE", NULL};
unsigned flags[] = { FLAG_DEPRECATED, FLAG_HIDE };
const char *flag_names[] = { "FLAG_DEPRECATED", "FLAG_HIDE", NULL};
printf("%s=%s", parm_table[parmIndex].label,
type[parm_table[parmIndex].type]);