[PATCHES] more loadparm cleanup
Michael Adam
obnox at samba.org
Tue Apr 28 17:19:44 MDT 2015
Hi,
attached find code that cleans up our loadparm
by removing flags specific to swat which has
been removed.
Note: the change that removes the flags from
the xml documents under docs-xml/smbdotconf
has been split into several commits, one per
subdirectory, for better overview. If desired,
these can also be squashed.
Review/comments/push appreciated.
Cheers - Michael
-------------- next part --------------
From 83b40ca6f0a3a9b8ebb92a802828dbc4b1c34a7f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Fri, 24 Apr 2015 10:14:35 +0200
Subject: [PATCH 01/22] s3:param: remove unused function
lp_parameter_is_canonical()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/include/proto.h | 1 -
source3/param/loadparm.c | 16 ----------------
2 files changed, 17 deletions(-)
diff --git a/source3/include/proto.h b/source3/include/proto.h
index f73778f..72c42f8 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1005,7 +1005,6 @@ int lp_add_service(const char *pszService, int iDefaultService);
bool lp_add_printer(const char *pszPrintername, int iDefaultService);
bool lp_parameter_is_valid(const char *pszParmName);
bool lp_parameter_is_global(const char *pszParmName);
-bool lp_parameter_is_canonical(const char *parm_name);
bool lp_canonicalize_parameter(const char *parm_name, const char **canon_parm,
bool *inverse);
bool lp_canonicalize_parameter_with_value(const char *parm_name,
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index b53cae2..0bb808e 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1568,22 +1568,6 @@ bool lp_parameter_is_global(const char *pszParmName)
}
/**************************************************************************
- Check whether the given name is the canonical name of a parameter.
- Returns false if it is not a valid parameter Name.
- For parametric options, true is returned.
-**************************************************************************/
-
-bool lp_parameter_is_canonical(const char *parm_name)
-{
- if (!lp_parameter_is_valid(parm_name)) {
- return false;
- }
-
- return (lpcfg_map_parameter(parm_name) ==
- map_parameter_canonical(parm_name, NULL));
-}
-
-/**************************************************************************
Determine the canonical name for a parameter.
Indicate when it is an inverse (boolean) synonym instead of a
"usual" synonym.
--
2.1.0
From 52d28271000d359400efd484bbe7164a59f2c4d8 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Fri, 24 Apr 2015 10:24:17 +0200
Subject: [PATCH 02/22] param:README: mention to explicitly initialize defaults
for special values
Signed-off-by: Michael Adam <obnox at samba.org>
---
lib/param/README | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/param/README b/lib/param/README
index e0b590a..6a53a45 100644
--- a/lib/param/README
+++ b/lib/param/README
@@ -12,6 +12,9 @@ Adding a parameter
To add or change an smb.conf option, you only have to modify
lib/param/param_table.c and add the documentation to docs-xml/smbdotconf.
+If special defaults are needed, the functions loadparm_int() in
+lib/param/loadparm.c and/or init_globals() in source3/param/loadparm.c
+need to be adapted accordingly.
The rest is generated for you.
--
2.1.0
From 4047b3fdbac492b1d4b0a31c2fb182251ae8f941 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 21 Apr 2015 17:25:24 +0200
Subject: [PATCH 03/22] param: Remove unused P_SEP and P_SEPARATOR
This was only used in swat.
Signed-off-by: Michael Adam <obnox at samba.org>
---
lib/param/loadparm.c | 8 -----
lib/param/loadparm.h | 4 +--
lib/param/param_table.c | 86 ++++++++++++++++++++++++++++++++++------------
python/samba/tests/docs.py | 2 --
source3/param/loadparm.c | 4 +--
source4/param/pyparam.c | 2 --
6 files changed, 67 insertions(+), 39 deletions(-)
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 34974d7..bb215b2 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -1549,8 +1549,6 @@ static bool set_variable_helper(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr
}
break;
- case P_SEP:
- break;
}
return true;
@@ -1876,8 +1874,6 @@ void lpcfg_print_parameter(struct parm_struct *p, void *ptr, FILE * f)
fprintf(f, "%s", *(char **)ptr);
}
break;
- case P_SEP:
- break;
}
}
@@ -1915,8 +1911,6 @@ static bool lpcfg_equal_parameter(parm_type type, void *ptr1, void *ptr2)
p2 = NULL;
return (p1 == p2 || strequal(p1, p2));
}
- case P_SEP:
- break;
}
return false;
}
@@ -2004,8 +1998,6 @@ static bool is_default(void *base_structure, int i)
case P_ENUM:
return parm_table[i].def.ivalue ==
*(int *)def_ptr;
- case P_SEP:
- break;
}
return false;
}
diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index 4d5c54e..b789db1 100644
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -36,11 +36,11 @@
/* the following are used by loadparm for option lists */
typedef enum {
P_BOOL,P_BOOLREV,P_CHAR,P_INTEGER,P_OCTAL,P_LIST,
- P_STRING,P_USTRING,P_ENUM,P_BYTES,P_CMDLIST,P_SEP
+ P_STRING,P_USTRING,P_ENUM,P_BYTES,P_CMDLIST
} parm_type;
typedef enum {
- P_LOCAL,P_GLOBAL,P_SEPARATOR,P_NONE
+ P_LOCAL,P_GLOBAL,P_NONE
} parm_class;
struct enum_list {
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 8b44733..6c2c686 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -293,7 +293,9 @@ static const struct enum_list enum_case[] = {
struct parm_struct parm_table[] = {
- {N_("Base Options"), P_SEP, P_SEPARATOR},
+ /*
+ * base options
+ */
{
.label = "dos charset",
@@ -431,7 +433,9 @@ struct parm_struct parm_table[] = {
.flags = FLAG_BASIC | FLAG_ADVANCED,
},
- {N_("Security Options"), P_SEP, P_SEPARATOR},
+ /*
+ * security options
+ */
{
.label = "security",
@@ -1157,8 +1161,9 @@ struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
-
- {N_("Logging Options"), P_SEP, P_SEPARATOR},
+ /*
+ * logging options
+ */
{
.label = "log level",
@@ -1296,7 +1301,9 @@ struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
- {N_("Protocol Options"), P_SEP, P_SEPARATOR},
+ /*
+ * protocol options
+ */
{
.label = "allocation roundup size",
@@ -1770,7 +1777,9 @@ struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
- {N_("Tuning Options"), P_SEP, P_SEPARATOR},
+ /*
+ * tuning options
+ */
{
.label = "block size",
@@ -2061,7 +2070,9 @@ struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
- {N_("Printing Options"), P_SEP, P_SEPARATOR},
+ /*
+ * printing options
+ */
{
.label = "max reported print jobs",
@@ -2390,7 +2401,9 @@ struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED | FLAG_PRINT,
},
- {N_("Filename Handling"), P_SEP, P_SEPARATOR},
+ /*
+ * filename handling options
+ */
{
.label = "mangling method",
@@ -2620,7 +2633,9 @@ struct parm_struct parm_table[] = {
},
- {N_("Domain Options"), P_SEP, P_SEPARATOR},
+ /*
+ * domain options
+ */
{
.label = "machine password timeout",
@@ -2632,7 +2647,9 @@ struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED | FLAG_WIZARD,
},
- {N_("Logon Options"), P_SEP, P_SEPARATOR},
+ /*
+ * logon options
+ */
{
.label = "add user script",
@@ -2818,7 +2835,9 @@ struct parm_struct parm_table[] = {
},
- {N_("Browse Options"), P_SEP, P_SEPARATOR},
+ /*
+ * browse options
+ */
{
.label = "os level",
@@ -2929,7 +2948,9 @@ struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
- {N_("WINS Options"), P_SEP, P_SEPARATOR},
+ /*
+ * WINS options
+ */
{
.label = "dns proxy",
@@ -2977,7 +2998,9 @@ struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
- {N_("Locking Options"), P_SEP, P_SEPARATOR},
+ /*
+ * locking options
+ */
{
.label = "blocking locks",
@@ -3106,7 +3129,9 @@ struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
- {N_("Ldap Options"), P_SEP, P_SEPARATOR},
+ /*
+ * ldap options
+ */
{
.label = "ldap admin dn",
@@ -3280,7 +3305,9 @@ struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
- {N_("EventLog Options"), P_SEP, P_SEPARATOR},
+ /*
+ * eventlog options
+ */
{
.label = "eventlog list",
@@ -3292,7 +3319,9 @@ struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
},
- {N_("Miscellaneous Options"), P_SEP, P_SEPARATOR},
+ /*
+ * miscellaneous options
+ */
{
.label = "add share command",
@@ -3901,7 +3930,9 @@ struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
- {N_("VFS module options"), P_SEP, P_SEPARATOR},
+ /*
+ * VFS module options
+ */
{
.label = "vfs objects",
@@ -3923,7 +3954,9 @@ struct parm_struct parm_table[] = {
},
- {N_("MSDFS options"), P_SEP, P_SEPARATOR},
+ /*
+ * MSDFS options
+ */
{
.label = "msdfs root",
@@ -3962,7 +3995,9 @@ struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
- {N_("Winbind options"), P_SEP, P_SEPARATOR},
+ /*
+ * winbindd options
+ */
{
.label = "passdb expand explicit",
@@ -4280,7 +4315,10 @@ struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
- {N_("DNS options"), P_SEP, P_SEPARATOR},
+ /*
+ * DNS options
+ */
+
{
.label = "allow dns updates",
.type = P_ENUM,
@@ -4336,7 +4374,9 @@ struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
- {N_("AD DC options"), P_SEP, P_SEPARATOR},
+ /*
+ * AD/DC options
+ */
{
.label = "samba kcc command",
@@ -4407,7 +4447,9 @@ struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
- {N_("TLS options"), P_SEP, P_SEPARATOR},
+ /*
+ * TLS options
+ */
{
.label = "tls enabled",
diff --git a/python/samba/tests/docs.py b/python/samba/tests/docs.py
index 3e7dcbc..1b9b94a 100644
--- a/python/samba/tests/docs.py
+++ b/python/samba/tests/docs.py
@@ -72,8 +72,6 @@ def get_implementation_parameters(sourcedir):
if re.match("^\s*\}\;\s*$", l):
break
# pull in the param names only
- if re.match(".*P_SEPARATOR.*", l):
- continue
m = re.match("\s*\.label\s*=\s*\"(.*)\".*", l)
if not m:
continue
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 0bb808e..10aae6f 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1713,7 +1713,7 @@ static void show_parameter(int parmIndex)
bool inverse;
const char *type[] = { "P_BOOL", "P_BOOLREV", "P_CHAR", "P_INTEGER",
"P_OCTAL", "P_LIST", "P_STRING", "P_USTRING",
- "P_ENUM", "P_SEP"};
+ "P_ENUM" };
unsigned flags[] = { FLAG_BASIC, FLAG_SHARE, FLAG_PRINT, FLAG_GLOBAL,
FLAG_WIZARD, FLAG_ADVANCED, FLAG_DEVELOPER, FLAG_DEPRECATED,
FLAG_HIDE};
@@ -2824,8 +2824,6 @@ static void lp_save_defaults(void)
parm_table[i].def.ivalue =
*(int *)lp_parm_ptr(NULL, &parm_table[i]);
break;
- case P_SEP:
- break;
}
}
diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c
index e780c2e..14ffb2d 100644
--- a/source4/param/pyparam.c
+++ b/source4/param/pyparam.c
@@ -143,8 +143,6 @@ static PyObject *py_lp_ctx_get_helper(struct loadparm_context *lp_ctx, const cha
PyString_FromString(strlist[j]));
return pylist;
}
- case P_SEP:
- return NULL; /* this stands for a separator, can be ignored */
}
return NULL;
--
2.1.0
From 91e0f85e63eaec857e4fa91d1a6c0385acc0f5e0 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Fri, 24 Apr 2015 09:36:05 +0200
Subject: [PATCH 04/22] param: remove swat specific flags.
keep FLAG_DEPRECATED, FLAG_DEFAULT, FLAG_HIDE (these are used)
and also FLAG_META, which might become useful
Signed-off-by: Michael Adam <obnox at samba.org>
---
lib/param/loadparm.h | 8 -
lib/param/param_table.c | 445 +++--------------------------------------------
source3/param/loadparm.c | 8 +-
3 files changed, 23 insertions(+), 438 deletions(-)
diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index b789db1..0a7937a 100644
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -94,14 +94,6 @@ 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 */
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 6c2c686..32ae7d4 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -272,20 +272,9 @@ static const struct enum_list enum_case[] = {
/* Note: We do not initialise the defaults union - it is not allowed in ANSI C
*
- * The FLAG_HIDE is explicit. Parameters set this way do NOT appear in any edit
- * screen in SWAT. This is used to exclude parameters as well as to squash all
- * parameters that have been duplicated by pseudonyms.
- *
- * NOTE: To display a parameter in BASIC view set FLAG_BASIC
- * Any parameter that does NOT have FLAG_ADVANCED will not disply at all
- * Set FLAG_SHARE and FLAG_PRINT to specifically display parameters in
- * respective views.
- *
- * NOTE2: Handling of duplicated (synonym) parameters:
- * Only the first occurance of a parameter should be enabled by FLAG_BASIC
- * and/or FLAG_ADVANCED. All duplicates following the first mention should be
- * set to FLAG_HIDE. ie: Make you must place the parameter that has the preferred
- * name first, and all synonyms must follow it with the FLAG_HIDE attribute.
+ * 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.
*/
#define GLOBAL_VAR(name) offsetof(struct loadparm_global, name)
@@ -304,7 +293,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(dos_charset),
.special = handle_dos_charset,
.enum_list = NULL,
- .flags = FLAG_ADVANCED
},
{
.label = "unix charset",
@@ -313,7 +301,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(unix_charset),
.special = handle_charset,
.enum_list = NULL,
- .flags = FLAG_ADVANCED
},
{
.label = "comment",
@@ -322,7 +309,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(comment),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT
},
{
.label = "path",
@@ -331,7 +317,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(path),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
},
{
.label = "directory",
@@ -349,7 +334,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(workgroup),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "realm",
@@ -358,7 +342,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(realm_original),
.special = handle_realm,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "netbios name",
@@ -367,7 +350,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(netbios_name),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "netbios aliases",
@@ -376,7 +358,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(netbios_aliases),
.special = handle_netbios_aliases,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "netbios scope",
@@ -385,7 +366,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(netbios_scope),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "server string",
@@ -394,7 +374,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(server_string),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED,
},
{
.label = "interfaces",
@@ -403,7 +382,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(interfaces),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "bind interfaces only",
@@ -412,7 +390,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(bind_interfaces_only),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "config backend",
@@ -421,7 +398,7 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(config_backend),
.special = NULL,
.enum_list = enum_config_backend,
- .flags = FLAG_HIDE|FLAG_ADVANCED|FLAG_META,
+ .flags = FLAG_META,
},
{
.label = "server role",
@@ -430,7 +407,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(_server_role),
.special = NULL,
.enum_list = enum_server_role,
- .flags = FLAG_BASIC | FLAG_ADVANCED,
},
/*
@@ -444,7 +420,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(_security),
.special = NULL,
.enum_list = enum_security,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "auth methods",
@@ -453,7 +428,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(auth_methods),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "encrypt passwords",
@@ -462,7 +436,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(encrypt_passwords),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "client schannel",
@@ -471,7 +444,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(client_schannel),
.special = NULL,
.enum_list = enum_bool_auto,
- .flags = FLAG_BASIC | FLAG_ADVANCED,
},
{
.label = "server schannel",
@@ -480,7 +452,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(server_schannel),
.special = NULL,
.enum_list = enum_bool_auto,
- .flags = FLAG_BASIC | FLAG_ADVANCED,
},
{
.label = "allow trusted domains",
@@ -489,7 +460,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(allow_trusted_domains),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "map to guest",
@@ -498,7 +468,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(map_to_guest),
.special = NULL,
.enum_list = enum_map_to_guest,
- .flags = FLAG_ADVANCED,
},
{
.label = "null passwords",
@@ -507,7 +476,7 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(null_passwords),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_DEPRECATED,
+ .flags = FLAG_DEPRECATED,
},
{
.label = "old password allowed period",
@@ -516,7 +485,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(old_password_allowed_period),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "obey pam restrictions",
@@ -525,7 +493,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(obey_pam_restrictions),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "password server",
@@ -534,7 +501,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(password_server),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "smb passwd file",
@@ -543,7 +509,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(smb_passwd_file),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "private dir",
@@ -552,7 +517,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(private_dir),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "private directory",
@@ -570,7 +534,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(passdb_backend),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "algorithmic rid base",
@@ -579,7 +542,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(algorithmic_rid_base),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "root directory",
@@ -588,7 +550,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(root_directory),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "root dir",
@@ -615,7 +576,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(guest_account),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED,
},
{
.label = "enable privileges",
@@ -624,7 +584,7 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(enable_privileges),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_DEPRECATED,
+ .flags = FLAG_DEPRECATED,
},
{
@@ -634,7 +594,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(pam_password_change),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "passwd program",
@@ -643,7 +602,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(passwd_program),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "passwd chat",
@@ -652,7 +610,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(passwd_chat),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "passwd chat debug",
@@ -661,7 +618,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(passwd_chat_debug),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "passwd chat timeout",
@@ -670,7 +626,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(passwd_chat_timeout),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "check password script",
@@ -679,7 +634,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(check_password_script),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "username map",
@@ -688,7 +642,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(username_map),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "username level",
@@ -697,7 +650,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(username_level),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "unix password sync",
@@ -706,7 +658,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(unix_password_sync),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "restrict anonymous",
@@ -715,7 +666,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(restrict_anonymous),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "lanman auth",
@@ -724,7 +674,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(lanman_auth),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ntlm auth",
@@ -733,7 +682,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ntlm_auth),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "client NTLMv2 auth",
@@ -742,7 +690,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(client_ntlmv2_auth),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "client lanman auth",
@@ -751,7 +698,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(client_lanman_auth),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "client plaintext auth",
@@ -760,7 +706,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(client_plaintext_auth),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "client use spnego principal",
@@ -769,7 +714,7 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(client_use_spnego_principal),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_DEPRECATED,
+ .flags = FLAG_DEPRECATED,
},
{
.label = "username",
@@ -778,7 +723,7 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(username),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE | FLAG_DEPRECATED,
+ .flags = FLAG_DEPRECATED,
},
{
.label = "user",
@@ -805,7 +750,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(invalid_users),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
},
{
.label = "valid users",
@@ -814,7 +758,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(valid_users),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
},
{
.label = "admin users",
@@ -823,7 +766,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(admin_users),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
},
{
.label = "read list",
@@ -832,7 +774,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(read_list),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
},
{
.label = "write list",
@@ -841,7 +782,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(write_list),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
},
{
.label = "force user",
@@ -850,7 +790,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(force_user),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "force group",
@@ -859,7 +798,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(force_group),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "group",
@@ -868,7 +806,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(force_group),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "read only",
@@ -877,7 +814,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(read_only),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "write ok",
@@ -913,7 +849,7 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(acl_check_permissions),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE | FLAG_DEPRECATED,
+ .flags = FLAG_DEPRECATED,
},
{
.label = "acl group control",
@@ -922,7 +858,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(acl_group_control),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
},
{
.label = "acl map full control",
@@ -931,7 +866,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(acl_map_full_control),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
},
{
.label = "acl allow execute always",
@@ -940,7 +874,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(acl_allow_execute_always),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
},
{
@@ -950,7 +883,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(create_mask),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
},
{
.label = "create mode",
@@ -968,7 +900,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(force_create_mode),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
},
{
.label = "directory mask",
@@ -977,7 +908,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(directory_mask),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
},
{
.label = "directory mode",
@@ -986,7 +916,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(directory_mask),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
{
.label = "force directory mode",
@@ -995,7 +924,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(force_directory_mode),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
},
{
.label = "force unknown acl user",
@@ -1004,7 +932,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(force_unknown_acl_user),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
},
{
.label = "inherit permissions",
@@ -1013,7 +940,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(inherit_permissions),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "inherit acls",
@@ -1022,7 +948,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(inherit_acls),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "inherit owner",
@@ -1031,7 +956,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(inherit_owner),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "guest only",
@@ -1040,7 +964,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(guest_only),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "only guest",
@@ -1058,7 +981,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(administrative_share),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
},
{
@@ -1068,7 +990,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(guest_ok),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
},
{
.label = "public",
@@ -1086,7 +1007,7 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(only_user),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_DEPRECATED,
+ .flags = FLAG_DEPRECATED,
},
{
.label = "hosts allow",
@@ -1095,7 +1016,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(hosts_allow),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_GLOBAL | FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
},
{
.label = "allow hosts",
@@ -1113,7 +1033,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(hosts_deny),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_GLOBAL | FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
},
{
.label = "deny hosts",
@@ -1131,7 +1050,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(preload_modules),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
{
.label = "dedicated keytab file",
@@ -1140,7 +1058,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(dedicated_keytab_file),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "kerberos method",
@@ -1149,7 +1066,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(kerberos_method),
.special = NULL,
.enum_list = enum_kerberos_method,
- .flags = FLAG_ADVANCED,
},
{
.label = "map untrusted to domain",
@@ -1158,7 +1074,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(map_untrusted_to_domain),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
/*
@@ -1172,7 +1087,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(log_level),
.special = handle_debug_list,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "debuglevel",
@@ -1190,7 +1104,7 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(syslog),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_DEPRECATED,
+ .flags = FLAG_DEPRECATED,
},
{
.label = "syslog only",
@@ -1199,7 +1113,7 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(syslog_only),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_DEPRECATED,
+ .flags = FLAG_DEPRECATED,
},
{
.label = "log file",
@@ -1208,7 +1122,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(logfile),
.special = handle_logfile,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "logging",
@@ -1217,7 +1130,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(logging),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "max log size",
@@ -1226,7 +1138,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(max_log_size),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "debug timestamp",
@@ -1235,7 +1146,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(timestamp_logs),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "timestamp logs",
@@ -1244,7 +1154,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(timestamp_logs),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "debug prefix timestamp",
@@ -1253,7 +1162,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(debug_prefix_timestamp),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "debug hires timestamp",
@@ -1262,7 +1170,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(debug_hires_timestamp),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "debug pid",
@@ -1271,7 +1178,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(debug_pid),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "debug uid",
@@ -1280,7 +1186,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(debug_uid),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "debug class",
@@ -1289,7 +1194,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(debug_class),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "enable core files",
@@ -1298,7 +1202,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(enable_core_files),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
/*
@@ -1312,7 +1215,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(allocation_roundup_size),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "aio read size",
@@ -1321,7 +1223,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(aio_read_size),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "aio write size",
@@ -1330,7 +1231,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(aio_write_size),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "aio write behind",
@@ -1339,7 +1239,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(aio_write_behind),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "smb ports",
@@ -1348,7 +1247,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(smb_ports),
.special = handle_smb_ports,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "large readwrite",
@@ -1357,7 +1255,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(large_readwrite),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "server max protocol",
@@ -1366,7 +1263,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(server_max_protocol),
.special = NULL,
.enum_list = enum_protocol,
- .flags = FLAG_ADVANCED,
},
{
.label = "max protocol",
@@ -1375,7 +1271,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(server_max_protocol),
.special = NULL,
.enum_list = enum_protocol,
- .flags = FLAG_ADVANCED,
},
{
.label = "protocol",
@@ -1384,7 +1279,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(server_max_protocol),
.special = NULL,
.enum_list = enum_protocol,
- .flags = FLAG_ADVANCED,
},
{
.label = "server min protocol",
@@ -1393,7 +1287,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(server_min_protocol),
.special = NULL,
.enum_list = enum_protocol,
- .flags = FLAG_ADVANCED,
},
{
.label = "min protocol",
@@ -1402,7 +1295,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(server_min_protocol),
.special = NULL,
.enum_list = enum_protocol,
- .flags = FLAG_ADVANCED,
},
{
.label = "client max protocol",
@@ -1411,7 +1303,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(_client_max_protocol),
.special = NULL,
.enum_list = enum_protocol,
- .flags = FLAG_ADVANCED,
},
{
.label = "client min protocol",
@@ -1420,7 +1311,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(client_min_protocol),
.special = NULL,
.enum_list = enum_protocol,
- .flags = FLAG_ADVANCED,
},
{
.label = "unicode",
@@ -1437,7 +1327,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(iminreceivefile),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "read raw",
@@ -1446,7 +1335,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(read_raw),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "write raw",
@@ -1455,7 +1343,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(write_raw),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "disable netbios",
@@ -1464,7 +1351,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(disable_netbios),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "reset on zero vc",
@@ -1473,7 +1359,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(reset_on_zero_vc),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "log writeable files on exit",
@@ -1482,7 +1367,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(log_writeable_files_on_exit),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "defer sharing violations",
@@ -1491,7 +1375,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(defer_sharing_violations),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
{
.label = "ea support",
@@ -1500,7 +1383,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(ea_support),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "nt acl support",
@@ -1509,7 +1391,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(nt_acl_support),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "nt pipe support",
@@ -1518,7 +1399,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(nt_pipe_support),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "nt status support",
@@ -1527,7 +1407,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(nt_status_support),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "smbd profiling level",
@@ -1536,7 +1415,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(smbd_profiling_level),
.special = NULL,
.enum_list = enum_smbd_profiling_level,
- .flags = FLAG_ADVANCED,
},
{
.label = "profile acls",
@@ -1545,7 +1423,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(profile_acls),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
},
{
.label = "map acl inherit",
@@ -1554,7 +1431,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(map_acl_inherit),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "afs share",
@@ -1563,7 +1439,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(afs_share),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "max mux",
@@ -1572,7 +1447,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(max_mux),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "max xmit",
@@ -1581,7 +1455,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(max_xmit),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "name resolve order",
@@ -1590,7 +1463,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(name_resolve_order),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "max ttl",
@@ -1599,7 +1471,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(max_ttl),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "max wins ttl",
@@ -1608,7 +1479,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(max_wins_ttl),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "min wins ttl",
@@ -1617,7 +1487,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(min_wins_ttl),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "time server",
@@ -1626,7 +1495,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(time_server),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "unix extensions",
@@ -1635,7 +1503,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(unix_extensions),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "use spnego",
@@ -1644,7 +1511,7 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(use_spnego),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_DEPRECATED,
+ .flags = FLAG_DEPRECATED,
},
{
.label = "client signing",
@@ -1653,7 +1520,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(client_signing),
.special = NULL,
.enum_list = enum_smb_signing_vals,
- .flags = FLAG_ADVANCED,
},
{
.label = "server signing",
@@ -1662,7 +1528,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(server_signing),
.special = NULL,
.enum_list = enum_smb_signing_vals,
- .flags = FLAG_ADVANCED,
},
{
.label = "smb encrypt",
@@ -1671,7 +1536,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(smb_encrypt),
.special = NULL,
.enum_list = enum_smb_signing_vals,
- .flags = FLAG_ADVANCED,
},
{
.label = "client use spnego",
@@ -1680,7 +1544,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(client_use_spnego),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "client ldap sasl wrapping",
@@ -1689,7 +1552,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(client_ldap_sasl_wrapping),
.special = NULL,
.enum_list = enum_ldap_sasl_wrapping,
- .flags = FLAG_ADVANCED,
},
{
.label = "enable asu support",
@@ -1698,7 +1560,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(enable_asu_support),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "svcctl list",
@@ -1707,7 +1568,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(svcctl_list),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "cldap port",
@@ -1774,7 +1634,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(durable_handles),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
/*
@@ -1788,7 +1647,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(block_size),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "deadtime",
@@ -1797,7 +1655,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(deadtime),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "getwd cache",
@@ -1806,7 +1663,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(getwd_cache),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "keepalive",
@@ -1815,7 +1671,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(keepalive),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "change notify",
@@ -1824,7 +1679,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(change_notify),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "directory name cache size",
@@ -1833,7 +1687,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(directory_name_cache_size),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "kernel change notify",
@@ -1842,7 +1695,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(kernel_change_notify),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "lpq cache time",
@@ -1851,7 +1703,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(lpq_cache_time),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "max smbd processes",
@@ -1860,7 +1711,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(max_smbd_processes),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "max connections",
@@ -1869,7 +1719,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(max_connections),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "max disk size",
@@ -1878,7 +1727,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(max_disk_size),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "max open files",
@@ -1887,7 +1735,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(max_open_files),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "min print space",
@@ -1896,7 +1743,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(min_print_space),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT,
},
{
.label = "socket options",
@@ -1905,7 +1751,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(socket_options),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "strict allocate",
@@ -1914,7 +1759,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(strict_allocate),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "strict rename",
@@ -1923,7 +1767,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(strict_rename),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "strict sync",
@@ -1932,7 +1775,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(strict_sync),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "sync always",
@@ -1941,7 +1783,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(sync_always),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "use mmap",
@@ -1950,7 +1791,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(use_mmap),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "use sendfile",
@@ -1959,7 +1799,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(_use_sendfile),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "hostname lookups",
@@ -1968,7 +1807,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(hostname_lookups),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "write cache size",
@@ -1977,7 +1815,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(write_cache_size),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "name cache timeout",
@@ -1986,7 +1823,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(name_cache_timeout),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ctdbd socket",
@@ -1995,7 +1831,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(_ctdbd_socket),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
{
.label = "cluster addresses",
@@ -2004,7 +1839,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(cluster_addresses),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
{
.label = "clustering",
@@ -2013,7 +1847,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(clustering),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
{
.label = "ctdb timeout",
@@ -2022,7 +1855,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ctdb_timeout),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
{
.label = "ctdb locktime warn threshold",
@@ -2031,7 +1863,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ctdb_locktime_warn_threshold),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
{
.label = "smb2 max read",
@@ -2040,7 +1871,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(smb2_max_read),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "smb2 max write",
@@ -2049,7 +1879,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(smb2_max_write),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "smb2 max trans",
@@ -2058,7 +1887,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(smb2_max_trans),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "smb2 max credits",
@@ -2067,7 +1895,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ismb2_max_credits),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
/*
@@ -2081,7 +1908,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(max_reported_print_jobs),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT,
},
{
.label = "max print jobs",
@@ -2090,7 +1916,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(iMaxPrintJobs),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT,
},
{
.label = "load printers",
@@ -2099,7 +1924,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(load_printers),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT,
},
{
.label = "printcap cache time",
@@ -2108,7 +1932,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(printcap_cache_time),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT,
},
{
.label = "printcap name",
@@ -2117,7 +1940,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(szPrintcapname),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT,
},
{
.label = "printcap",
@@ -2135,7 +1957,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(printable),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT,
},
{
.label = "print notify backchannel",
@@ -2144,7 +1965,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(print_notify_backchannel),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "print ok",
@@ -2162,7 +1982,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(printing),
.special = handle_printing,
.enum_list = enum_printing,
- .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
},
{
.label = "cups options",
@@ -2171,7 +1990,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(cups_options),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
},
{
.label = "cups server",
@@ -2180,7 +1998,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(cups_server),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
},
{
.label = "cups encrypt",
@@ -2189,7 +2006,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(CupsEncrypt),
.special = NULL,
.enum_list = enum_bool_auto,
- .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
},
{
@@ -2199,7 +2015,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(cups_connection_timeout),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "iprint server",
@@ -2208,7 +2023,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(iprint_server),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
},
{
.label = "print command",
@@ -2217,7 +2031,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(print_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
},
{
.label = "disable spoolss",
@@ -2226,7 +2039,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(_disable_spoolss),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
},
{
.label = "enable spoolss",
@@ -2244,7 +2056,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(lpq_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
},
{
.label = "lprm command",
@@ -2253,7 +2064,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(lprm_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
},
{
.label = "lppause command",
@@ -2262,7 +2072,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(lppause_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
},
{
.label = "lpresume command",
@@ -2271,7 +2080,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(lpresume_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
},
{
.label = "queuepause command",
@@ -2280,7 +2088,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(queuepause_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
},
{
.label = "queueresume command",
@@ -2289,7 +2096,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(queueresume_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
},
{
.label = "addport command",
@@ -2298,7 +2104,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(addport_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "enumports command",
@@ -2307,7 +2112,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(enumports_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "addprinter command",
@@ -2316,7 +2120,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(addprinter_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "deleteprinter command",
@@ -2325,7 +2128,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(deleteprinter_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "show add printer wizard",
@@ -2334,7 +2136,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(show_add_printer_wizard),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "os2 driver map",
@@ -2343,7 +2144,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(os2_driver_map),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
@@ -2353,7 +2153,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(_printername),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT,
},
{
.label = "printer",
@@ -2371,7 +2170,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(use_client_driver),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT,
},
{
.label = "default devmode",
@@ -2380,7 +2178,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(default_devmode),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT,
},
{
.label = "force printername",
@@ -2389,7 +2186,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(force_printername),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT,
},
{
.label = "printjob username",
@@ -2398,7 +2194,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(printjob_username),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_PRINT,
},
/*
@@ -2412,7 +2207,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(mangling_method),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "mangle prefix",
@@ -2421,7 +2215,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(mangle_prefix),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
@@ -2431,7 +2224,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(default_case),
.special = NULL,
.enum_list = enum_case,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "case sensitive",
@@ -2440,7 +2232,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(case_sensitive),
.special = NULL,
.enum_list = enum_bool_auto,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "casesignames",
@@ -2449,7 +2240,7 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(case_sensitive),
.special = NULL,
.enum_list = enum_bool_auto,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL | FLAG_HIDE,
+ .flags = FLAG_HIDE,
},
{
.label = "preserve case",
@@ -2458,7 +2249,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(preserve_case),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "short preserve case",
@@ -2467,7 +2257,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(short_preserve_case),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "mangling char",
@@ -2476,7 +2265,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(mangling_char),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "hide dot files",
@@ -2485,7 +2273,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(hide_dot_files),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "hide special files",
@@ -2494,7 +2281,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(hide_special_files),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "hide unreadable",
@@ -2503,7 +2289,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(hide_unreadable),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "hide unwriteable files",
@@ -2512,7 +2297,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(hide_unwriteable_files),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "delete veto files",
@@ -2521,7 +2305,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(delete_veto_files),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "veto files",
@@ -2530,7 +2313,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(veto_files),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "hide files",
@@ -2539,7 +2321,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(hide_files),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "veto oplock files",
@@ -2548,7 +2329,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(veto_oplock_files),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "map archive",
@@ -2557,7 +2337,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(map_archive),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "map hidden",
@@ -2566,7 +2345,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(map_hidden),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "map system",
@@ -2575,7 +2353,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(map_system),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "map readonly",
@@ -2584,7 +2361,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(map_readonly),
.special = NULL,
.enum_list = enum_map_readonly,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "mangled names",
@@ -2593,7 +2369,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(mangled_names),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "max stat cache size",
@@ -2602,7 +2377,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(max_stat_cache_size),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "stat cache",
@@ -2611,7 +2385,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(stat_cache),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "store dos attributes",
@@ -2620,7 +2393,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(store_dos_attributes),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "dmapi support",
@@ -2629,7 +2401,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(dmapi_support),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
@@ -2644,7 +2415,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(machine_password_timeout),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_WIZARD,
},
/*
@@ -2658,7 +2428,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(add_user_script),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "rename user script",
@@ -2667,7 +2436,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(rename_user_script),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "delete user script",
@@ -2676,7 +2444,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(delete_user_script),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "add group script",
@@ -2685,7 +2452,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(add_group_script),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "delete group script",
@@ -2694,7 +2460,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(delete_group_script),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "add user to group script",
@@ -2703,7 +2468,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(add_user_to_group_script),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "delete user from group script",
@@ -2712,7 +2476,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(delete_user_from_group_script),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "set primary group script",
@@ -2721,7 +2484,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(set_primary_group_script),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "add machine script",
@@ -2730,7 +2492,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(add_machine_script),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "shutdown script",
@@ -2739,7 +2500,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(shutdown_script),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "abort shutdown script",
@@ -2748,7 +2508,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(abort_shutdown_script),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "username map script",
@@ -2757,7 +2516,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(username_map_script),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "username map cache time",
@@ -2766,7 +2524,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(username_map_cache_time),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "logon script",
@@ -2775,7 +2532,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(logon_script),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "logon path",
@@ -2784,7 +2540,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(logon_path),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "logon drive",
@@ -2793,7 +2548,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(logon_drive),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "logon home",
@@ -2802,7 +2556,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(logon_home),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "domain logons",
@@ -2811,7 +2564,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(_domain_logons),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
@@ -2821,7 +2573,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(init_logon_delayed_hosts),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
@@ -2831,7 +2582,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(init_logon_delay),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
@@ -2846,7 +2596,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(os_level),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED,
},
{
.label = "lm announce",
@@ -2855,7 +2604,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(lm_announce),
.special = NULL,
.enum_list = enum_bool_auto,
- .flags = FLAG_ADVANCED,
},
{
.label = "lm interval",
@@ -2864,7 +2612,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(lm_interval),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "preferred master",
@@ -2873,7 +2620,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(iPreferredMaster),
.special = NULL,
.enum_list = enum_bool_auto,
- .flags = FLAG_BASIC | FLAG_ADVANCED,
},
{
.label = "prefered master",
@@ -2891,7 +2637,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(local_master),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED,
},
{
.label = "domain master",
@@ -2900,7 +2645,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(_domain_master),
.special = NULL,
.enum_list = enum_bool_auto,
- .flags = FLAG_BASIC | FLAG_ADVANCED,
},
{
.label = "browse list",
@@ -2909,7 +2653,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(browse_list),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "browseable",
@@ -2918,7 +2661,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(browseable),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
},
{
.label = "browsable",
@@ -2936,7 +2678,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(access_based_share_enum),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE
},
{
.label = "enhanced browsing",
@@ -2945,7 +2686,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(enhanced_browsing),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
/*
@@ -2959,7 +2699,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(wins_dns_proxy),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "wins proxy",
@@ -2968,7 +2707,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(wins_proxy),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "wins server",
@@ -2977,7 +2715,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(wins_server_list),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "wins support",
@@ -2986,7 +2723,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(we_are_a_wins_server),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "wins hook",
@@ -2995,7 +2731,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(wins_hook),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
/*
@@ -3009,7 +2744,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(blocking_locks),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "csc policy",
@@ -3018,7 +2752,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(csc_policy),
.special = NULL,
.enum_list = enum_csc_policy,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "fake oplocks",
@@ -3027,7 +2760,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(fake_oplocks),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "kernel oplocks",
@@ -3036,7 +2768,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(kernel_oplocks),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "kernel share modes",
@@ -3045,7 +2776,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(kernel_share_modes),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "smb2 leases",
@@ -3054,7 +2784,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(smb2_leases),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "locking",
@@ -3063,7 +2792,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(locking),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "lock spin time",
@@ -3072,7 +2800,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(lock_spin_time),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
{
.label = "oplocks",
@@ -3081,7 +2808,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(oplocks),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "level2 oplocks",
@@ -3090,7 +2816,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(level2_oplocks),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "oplock break wait time",
@@ -3099,7 +2824,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(oplock_break_wait_time),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
{
.label = "oplock contention limit",
@@ -3108,7 +2832,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(oplock_contention_limit),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "posix locking",
@@ -3117,7 +2840,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(posix_locking),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "strict locking",
@@ -3126,7 +2848,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(strict_locking),
.special = NULL,
.enum_list = enum_bool_auto,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
/*
@@ -3140,7 +2861,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ldap_admin_dn),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap delete dn",
@@ -3149,7 +2869,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ldap_delete_dn),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap group suffix",
@@ -3158,7 +2877,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(szLdapGroupSuffix),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap idmap suffix",
@@ -3167,7 +2885,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(szLdapIdmapSuffix),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap machine suffix",
@@ -3176,7 +2893,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(szLdapMachineSuffix),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap passwd sync",
@@ -3185,7 +2901,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ldap_passwd_sync),
.special = NULL,
.enum_list = enum_ldap_passwd_sync,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap password sync",
@@ -3203,7 +2918,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ldap_replication_sleep),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap suffix",
@@ -3212,7 +2926,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ldap_suffix),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap ssl",
@@ -3221,7 +2934,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ldap_ssl),
.special = NULL,
.enum_list = enum_ldap_ssl,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap ssl ads",
@@ -3230,7 +2942,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ldap_ssl_ads),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap deref",
@@ -3239,7 +2950,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ldap_deref),
.special = NULL,
.enum_list = enum_ldap_deref,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap follow referral",
@@ -3248,7 +2958,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ldap_follow_referral),
.special = NULL,
.enum_list = enum_bool_auto,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap timeout",
@@ -3257,7 +2966,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ldap_timeout),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap connection timeout",
@@ -3266,7 +2974,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ldap_connection_timeout),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap page size",
@@ -3275,7 +2982,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ldap_page_size),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap user suffix",
@@ -3284,7 +2990,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(szLdapUserSuffix),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap debug level",
@@ -3293,7 +2998,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ldap_debug_level),
.special = handle_ldap_debug_level,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ldap debug threshold",
@@ -3302,7 +3006,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ldap_debug_threshold),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
/*
@@ -3316,7 +3019,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(eventlog_list),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
},
/*
@@ -3330,7 +3032,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(add_share_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "change share command",
@@ -3339,7 +3040,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(change_share_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "delete share command",
@@ -3348,7 +3048,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(delete_share_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "config file",
@@ -3357,7 +3056,7 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(next_configfile),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_HIDE|FLAG_META,
+ .flags = FLAG_META,
},
{
.label = "preload",
@@ -3366,7 +3065,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(auto_services),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "auto services",
@@ -3375,7 +3073,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(auto_services),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "lock directory",
@@ -3384,7 +3081,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(lock_directory),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "lock dir",
@@ -3402,7 +3098,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(state_directory),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "cache directory",
@@ -3411,7 +3106,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(cache_directory),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "pid directory",
@@ -3420,7 +3114,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(pid_directory),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ntp signd socket directory",
@@ -3429,7 +3122,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ntp_signd_socket_directory),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
#ifdef WITH_UTMP
@@ -3440,7 +3132,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(utmp_directory),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "wtmp directory",
@@ -3449,7 +3140,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(wtmp_directory),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "utmp",
@@ -3458,7 +3148,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(utmp),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
#endif
{
@@ -3468,7 +3157,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(defaultservice),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "default",
@@ -3477,7 +3165,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(defaultservice),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "message command",
@@ -3486,7 +3173,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(message_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "dfree cache time",
@@ -3495,7 +3181,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(dfree_cache_time),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "dfree command",
@@ -3504,7 +3189,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(dfree_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "get quota command",
@@ -3513,7 +3197,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(get_quota_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "set quota command",
@@ -3522,7 +3205,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(set_quota_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "remote announce",
@@ -3531,7 +3213,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(remote_announce),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "remote browse sync",
@@ -3540,7 +3221,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(remote_browse_sync),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "nbt client socket address",
@@ -3549,7 +3229,7 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(nbt_client_socket_address),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_DEPRECATED,
+ .flags = FLAG_DEPRECATED,
},
{
.label = "socket address",
@@ -3558,7 +3238,7 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(nbt_client_socket_address),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_DEPRECATED,
+ .flags = FLAG_DEPRECATED,
},
{
.label = "nmbd bind explicit broadcast",
@@ -3567,7 +3247,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(nmbd_bind_explicit_broadcast),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "homedir map",
@@ -3576,7 +3255,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(homedir_map),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "afs username map",
@@ -3585,7 +3263,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(afs_username_map),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "afs token lifetime",
@@ -3594,7 +3271,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(afs_token_lifetime),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "log nt token command",
@@ -3603,7 +3279,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(log_nt_token_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "NIS homedir",
@@ -3612,7 +3287,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(nis_homedir),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "-valid",
@@ -3639,7 +3313,7 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(szInclude),
.special = handle_include,
.enum_list = NULL,
- .flags = FLAG_HIDE|FLAG_META,
+ .flags = FLAG_META,
},
{
.label = "preexec",
@@ -3648,7 +3322,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(preexec),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
},
{
.label = "exec",
@@ -3657,7 +3330,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(preexec),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "preexec close",
@@ -3666,7 +3338,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(preexec_close),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "postexec",
@@ -3675,7 +3346,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(postexec),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
},
{
.label = "root preexec",
@@ -3684,7 +3354,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(root_preexec),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
},
{
.label = "root preexec close",
@@ -3693,7 +3362,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(root_preexec_close),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "root postexec",
@@ -3702,7 +3370,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(root_postexec),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
},
{
.label = "available",
@@ -3711,7 +3378,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(bAvailable),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
},
{
.label = "registry shares",
@@ -3720,7 +3386,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(registry_shares),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "usershare allow guests",
@@ -3729,7 +3394,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(usershare_allow_guests),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "usershare max shares",
@@ -3738,7 +3402,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(usershare_max_shares),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "usershare owner only",
@@ -3747,7 +3410,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(usershare_owner_only),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "usershare path",
@@ -3756,7 +3418,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(usershare_path),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "usershare prefix allow list",
@@ -3765,7 +3426,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(usershare_prefix_allow_list),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "usershare prefix deny list",
@@ -3774,7 +3434,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(usershare_prefix_deny_list),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "usershare template share",
@@ -3783,7 +3442,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(usershare_template_share),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "volume",
@@ -3792,7 +3450,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(volume),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "fstype",
@@ -3801,7 +3458,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(fstype),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "allow insecure wide links",
@@ -3810,7 +3466,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(allow_insecure_wide_links),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "wide links",
@@ -3819,7 +3474,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(bWidelinks),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "follow symlinks",
@@ -3828,7 +3482,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(follow_symlinks),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "dont descend",
@@ -3837,7 +3490,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(dont_descend),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "magic script",
@@ -3846,7 +3498,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(magic_script),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "magic output",
@@ -3855,7 +3506,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(magic_output),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "delete readonly",
@@ -3864,7 +3514,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(delete_readonly),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "dos filemode",
@@ -3873,7 +3522,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(dos_filemode),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "dos filetimes",
@@ -3882,7 +3530,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(dos_filetimes),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "dos filetime resolution",
@@ -3891,7 +3538,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(dos_filetime_resolution),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "fake directory create times",
@@ -3900,7 +3546,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(fake_directory_create_times),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
{
.label = "async smb echo handler",
@@ -3909,7 +3554,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(async_smb_echo_handler),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
{
.label = "panic action",
@@ -3918,7 +3562,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(panic_action),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "perfcount module",
@@ -3927,7 +3570,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(perfcount_module),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
/*
@@ -3941,7 +3583,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(vfs_objects),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "vfs object",
@@ -3965,7 +3606,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(msdfs_root),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "msdfs proxy",
@@ -3974,7 +3614,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(msdfs_proxy),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "msdfs shuffle referrals",
@@ -3983,7 +3622,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(msdfs_shuffle_referrals),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "host msdfs",
@@ -3992,7 +3630,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(host_msdfs),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
/*
@@ -4006,7 +3643,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(passdb_expand_explicit),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "idmap backend",
@@ -4015,7 +3651,7 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(szIdmapBackend),
.special = handle_idmap_backend,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_DEPRECATED,
+ .flags = FLAG_DEPRECATED,
},
{
.label = "idmap cache time",
@@ -4024,7 +3660,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(idmap_cache_time),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "idmap negative cache time",
@@ -4033,7 +3668,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(idmap_negative_cache_time),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "idmap uid",
@@ -4042,7 +3676,7 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(szIdmapUID),
.special = handle_idmap_uid,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_DEPRECATED,
+ .flags = FLAG_DEPRECATED,
},
{
.label = "winbind uid",
@@ -4060,7 +3694,7 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(szIdmapGID),
.special = handle_idmap_gid,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_DEPRECATED,
+ .flags = FLAG_DEPRECATED,
},
{
.label = "winbind gid",
@@ -4078,7 +3712,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(template_homedir),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "template shell",
@@ -4087,7 +3720,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(template_shell),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind separator",
@@ -4096,7 +3728,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_separator),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind cache time",
@@ -4105,7 +3736,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_cache_time),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind reconnect delay",
@@ -4114,7 +3744,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_reconnect_delay),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind request timeout",
@@ -4123,7 +3752,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_request_timeout),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind max clients",
@@ -4132,7 +3760,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_max_clients),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind enum users",
@@ -4141,7 +3768,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_enum_users),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind enum groups",
@@ -4150,7 +3776,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_enum_groups),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind use default domain",
@@ -4159,7 +3784,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_use_default_domain),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind trusted domains only",
@@ -4168,7 +3792,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_trusted_domains_only),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind nested groups",
@@ -4177,7 +3800,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_nested_groups),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind expand groups",
@@ -4186,7 +3808,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_expand_groups),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind nss info",
@@ -4195,7 +3816,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_nss_info),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind refresh tickets",
@@ -4204,7 +3824,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_refresh_tickets),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind offline logon",
@@ -4213,7 +3832,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_offline_logon),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind normalize names",
@@ -4222,7 +3840,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_normalize_names),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind rpc only",
@@ -4231,7 +3848,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_rpc_only),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "create krb5 conf",
@@ -4240,7 +3856,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(create_krb5_conf),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "ncalrpc dir",
@@ -4249,7 +3864,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(ncalrpc_dir),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind max domain connections",
@@ -4258,7 +3872,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbindMaxDomainConnections),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbindd socket directory",
@@ -4267,7 +3880,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbindd_socket_directory),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbindd privileged socket directory",
@@ -4276,7 +3888,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbindd_privileged_socket_directory),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "winbind sealed pipes",
@@ -4285,7 +3896,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(winbind_sealed_pipes),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "neutralize nt4 emulation",
@@ -4294,7 +3904,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(neutralize_nt4_emulation),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "reject md5 servers",
@@ -4303,7 +3912,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(reject_md5_servers),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "require strong key",
@@ -4312,7 +3920,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(require_strong_key),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
/*
@@ -4326,7 +3933,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(allow_dns_updates),
.special = NULL,
.enum_list = enum_dns_update_settings,
- .flags = FLAG_ADVANCED,
},
{
.label = "dns forwarder",
@@ -4335,7 +3941,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(dns_forwarder),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "dns update command",
@@ -4344,7 +3949,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(dns_update_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "nsupdate command",
@@ -4353,7 +3957,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(nsupdate_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "rndc command",
@@ -4362,7 +3965,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(rndc_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "multicast dns register",
@@ -4371,7 +3973,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(multicast_dns_register),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
/*
@@ -4385,7 +3986,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(samba_kcc_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "server services",
@@ -4410,7 +4010,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(spn_update_command),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "share backend",
@@ -4435,7 +4034,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(allow_nt4_crypto),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
{
.label = "reject md5 clients",
@@ -4444,7 +4042,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(reject_md5_clients),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_ADVANCED,
},
/*
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 10aae6f..de1b98f0 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -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]);
--
2.1.0
From 1e4f9757e8669413e8f755781e28889726bfa444 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 27 Apr 2015 17:35:41 +0200
Subject: [PATCH 05/22] param: remove unused FLAG_META
Signed-off-by: Michael Adam <obnox at samba.org>
---
lib/param/loadparm.h | 1 -
lib/param/param_table.c | 3 ---
2 files changed, 4 deletions(-)
diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index 0a7937a..2be3078 100644
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -96,7 +96,6 @@ 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_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 */
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 32ae7d4..637bc2d 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -398,7 +398,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(config_backend),
.special = NULL,
.enum_list = enum_config_backend,
- .flags = FLAG_META,
},
{
.label = "server role",
@@ -3056,7 +3055,6 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(next_configfile),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_META,
},
{
.label = "preload",
@@ -3313,7 +3311,6 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(szInclude),
.special = handle_include,
.enum_list = NULL,
- .flags = FLAG_META,
},
{
.label = "preexec",
--
2.1.0
From 51dd9462f83316c7ceafa23db3d7cc1b965d95d2 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Fri, 24 Apr 2015 09:57:08 +0200
Subject: [PATCH 06/22] param: rename FLAG_HIDE to FLAG_SYNONYM
This is what it is used for - detect synonyms.
Signed-off-by: Michael Adam <obnox at samba.org>
---
lib/param/loadparm.h | 2 +-
lib/param/param_table.c | 60 ++++++++++++++++++++++++------------------------
source3/param/loadparm.c | 10 ++++----
3 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index 2be3078..c762259 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 637bc2d..040c472 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)
@@ -325,7 +325,7 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(path),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_HIDE,
+ .flags = FLAG_SYNONYM,
},
{
.label = "workgroup",
@@ -524,7 +524,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",
@@ -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 = "root",
@@ -566,7 +566,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",
@@ -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 = "users",
@@ -740,7 +740,7 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(username),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_HIDE,
+ .flags = FLAG_SYNONYM,
},
{
.label = "invalid users",
@@ -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 = "writeable",
@@ -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 = "writable",
@@ -839,7 +839,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",
@@ -890,7 +890,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",
@@ -971,7 +971,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",
@@ -997,7 +997,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",
@@ -1023,7 +1023,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",
@@ -1040,7 +1040,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",
@@ -1094,7 +1094,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",
@@ -1947,7 +1947,7 @@ struct parm_struct parm_table[] = {
.offset = GLOBAL_VAR(szPrintcapname),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_HIDE,
+ .flags = FLAG_SYNONYM,
},
{
.label = "printable",
@@ -1972,7 +1972,7 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(printable),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_HIDE,
+ .flags = FLAG_SYNONYM,
},
{
.label = "printing",
@@ -2046,7 +2046,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",
@@ -2160,7 +2160,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",
@@ -2239,7 +2239,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",
@@ -2627,7 +2627,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",
@@ -2668,7 +2668,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",
@@ -2908,7 +2908,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",
@@ -3087,7 +3087,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",
@@ -3293,7 +3293,7 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(valid),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_HIDE,
+ .flags = FLAG_SYNONYM,
},
{
.label = "copy",
@@ -3302,7 +3302,7 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(szCopy),
.special = handle_copy,
.enum_list = NULL,
- .flags = FLAG_HIDE,
+ .flags = FLAG_SYNONYM,
},
{
.label = "include",
@@ -3588,7 +3588,7 @@ struct parm_struct parm_table[] = {
.offset = LOCAL_VAR(vfs_objects),
.special = NULL,
.enum_list = NULL,
- .flags = FLAG_HIDE,
+ .flags = FLAG_SYNONYM,
},
@@ -3682,7 +3682,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",
@@ -3700,7 +3700,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",
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index de1b98f0..d876eaf 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1652,7 +1652,7 @@ static int map_parameter_canonical(const char *pszParmName, bool *inverse)
bool loc_inverse = false;
parm_num = lpcfg_map_parameter(pszParmName);
- if ((parm_num < 0) || !(parm_table[parm_num].flags & FLAG_HIDE)) {
+ if ((parm_num < 0) || !(parm_table[parm_num].flags & FLAG_SYNONYM)) {
/* invalid, parametric or no canidate for synonyms ... */
goto done;
}
@@ -1682,8 +1682,8 @@ static bool is_synonym_of(int parm1, int parm2, bool *inverse)
{
if ((parm_table[parm1].offset == parm_table[parm2].offset) &&
(parm_table[parm1].p_class == parm_table[parm2].p_class) &&
- (parm_table[parm1].flags & FLAG_HIDE) &&
- !(parm_table[parm2].flags & FLAG_HIDE))
+ (parm_table[parm1].flags & FLAG_SYNONYM) &&
+ !(parm_table[parm2].flags & FLAG_SYNONYM))
{
if (inverse != NULL) {
if ((parm_table[parm1].type == P_BOOLREV) &&
@@ -1714,8 +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_DEPRECATED, FLAG_HIDE };
- const char *flag_names[] = { "FLAG_DEPRECATED", "FLAG_HIDE", NULL};
+ unsigned flags[] = { FLAG_DEPRECATED, FLAG_SYNONYM };
+ const char *flag_names[] = { "FLAG_DEPRECATED", "FLAG_SYNONYM", NULL};
printf("%s=%s", parm_table[parmIndex].label,
type[parm_table[parmIndex].type]);
--
2.1.0
From 1a2a53917461b576a70e71669c53705b2caebe6d Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 28 Apr 2015 13:59:01 +0200
Subject: [PATCH 07/22] docs:smbdotconf: remove swat-specific flags from base/
Signed-off-by: Michael Adam <obnox at samba.org>
---
docs-xml/smbdotconf/base/bindinterfacesonly.xml | 1 -
docs-xml/smbdotconf/base/comment.xml | 1 -
docs-xml/smbdotconf/base/configbackend.xml | 1 -
docs-xml/smbdotconf/base/doscharset.xml | 1 -
docs-xml/smbdotconf/base/enablecorefiles.xml | 1 -
docs-xml/smbdotconf/base/interfaces.xml | 1 -
docs-xml/smbdotconf/base/multicastdnsregister.xml | 1 -
docs-xml/smbdotconf/base/netbiosaliases.xml | 1 -
docs-xml/smbdotconf/base/netbiosname.xml | 1 -
docs-xml/smbdotconf/base/netbiosscope.xml | 1 -
docs-xml/smbdotconf/base/path.xml | 1 -
docs-xml/smbdotconf/base/realm.xml | 1 -
docs-xml/smbdotconf/base/serverservices.xml | 1 -
docs-xml/smbdotconf/base/serverstring.xml | 1 -
docs-xml/smbdotconf/base/unixcharset.xml | 1 -
docs-xml/smbdotconf/base/workgroup.xml | 1 -
16 files changed, 16 deletions(-)
diff --git a/docs-xml/smbdotconf/base/bindinterfacesonly.xml b/docs-xml/smbdotconf/base/bindinterfacesonly.xml
index b9b420d..31b462c 100644
--- a/docs-xml/smbdotconf/base/bindinterfacesonly.xml
+++ b/docs-xml/smbdotconf/base/bindinterfacesonly.xml
@@ -1,7 +1,6 @@
<samba:parameter name="bind interfaces only"
type="boolean"
context="G"
- advanced="1" wizard="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This global parameter allows the Samba admin
diff --git a/docs-xml/smbdotconf/base/comment.xml b/docs-xml/smbdotconf/base/comment.xml
index ce3b574..3c2c3b1 100644
--- a/docs-xml/smbdotconf/base/comment.xml
+++ b/docs-xml/smbdotconf/base/comment.xml
@@ -1,7 +1,6 @@
<samba:parameter name="comment"
context="S"
type="string"
- basic="1" advanced="1" share="1" print="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This is a text field that is seen next to a share
diff --git a/docs-xml/smbdotconf/base/configbackend.xml b/docs-xml/smbdotconf/base/configbackend.xml
index f9da134..864ec3c 100644
--- a/docs-xml/smbdotconf/base/configbackend.xml
+++ b/docs-xml/smbdotconf/base/configbackend.xml
@@ -1,7 +1,6 @@
<samba:parameter name="config backend"
context="G"
type="enum"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/base/doscharset.xml b/docs-xml/smbdotconf/base/doscharset.xml
index f8d5432..8a18c93 100644
--- a/docs-xml/smbdotconf/base/doscharset.xml
+++ b/docs-xml/smbdotconf/base/doscharset.xml
@@ -1,7 +1,6 @@
<samba:parameter name="dos charset"
type="string"
context="G"
- advanced="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/base/enablecorefiles.xml b/docs-xml/smbdotconf/base/enablecorefiles.xml
index 416dd45..9aa057f 100644
--- a/docs-xml/smbdotconf/base/enablecorefiles.xml
+++ b/docs-xml/smbdotconf/base/enablecorefiles.xml
@@ -1,7 +1,6 @@
<samba:parameter name="enable core files"
context="G"
type="boolean"
- basic="1" advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/base/interfaces.xml b/docs-xml/smbdotconf/base/interfaces.xml
index 8c3684f..39c90b9 100644
--- a/docs-xml/smbdotconf/base/interfaces.xml
+++ b/docs-xml/smbdotconf/base/interfaces.xml
@@ -1,7 +1,6 @@
<samba:parameter name="interfaces"
context="G"
type="list"
- basic="1" advanced="1" wizard="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option allows you to override the default
diff --git a/docs-xml/smbdotconf/base/multicastdnsregister.xml b/docs-xml/smbdotconf/base/multicastdnsregister.xml
index 32d9cfc..87559e5 100644
--- a/docs-xml/smbdotconf/base/multicastdnsregister.xml
+++ b/docs-xml/smbdotconf/base/multicastdnsregister.xml
@@ -1,7 +1,6 @@
<samba:parameter name="multicast dns register"
type="boolean"
context="G"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>If compiled with proper support for it, Samba will
diff --git a/docs-xml/smbdotconf/base/netbiosaliases.xml b/docs-xml/smbdotconf/base/netbiosaliases.xml
index 5d58fc2..46f97e2 100644
--- a/docs-xml/smbdotconf/base/netbiosaliases.xml
+++ b/docs-xml/smbdotconf/base/netbiosaliases.xml
@@ -1,7 +1,6 @@
<samba:parameter name="netbios aliases"
context="G"
type="list"
- advanced="1" wizard="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This is a list of NetBIOS names that nmbd will
diff --git a/docs-xml/smbdotconf/base/netbiosname.xml b/docs-xml/smbdotconf/base/netbiosname.xml
index 60bc082..3369e3e 100644
--- a/docs-xml/smbdotconf/base/netbiosname.xml
+++ b/docs-xml/smbdotconf/base/netbiosname.xml
@@ -1,7 +1,6 @@
<samba:parameter name="netbios name"
context="G"
type="string"
- basic="1" advanced="1" wizard="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/base/netbiosscope.xml b/docs-xml/smbdotconf/base/netbiosscope.xml
index 0590645..811e1c6 100644
--- a/docs-xml/smbdotconf/base/netbiosscope.xml
+++ b/docs-xml/smbdotconf/base/netbiosscope.xml
@@ -1,7 +1,6 @@
<samba:parameter name="netbios scope"
context="G"
type="string"
- advanced="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/base/path.xml b/docs-xml/smbdotconf/base/path.xml
index 49224af..c84e039 100644
--- a/docs-xml/smbdotconf/base/path.xml
+++ b/docs-xml/smbdotconf/base/path.xml
@@ -1,7 +1,6 @@
<samba:parameter name="path"
context="S"
type="string"
- basic="1" advanced="1" share="1" print="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>directory</synonym>
<description>
diff --git a/docs-xml/smbdotconf/base/realm.xml b/docs-xml/smbdotconf/base/realm.xml
index 8d56b56..ab56ec5 100644
--- a/docs-xml/smbdotconf/base/realm.xml
+++ b/docs-xml/smbdotconf/base/realm.xml
@@ -1,7 +1,6 @@
<samba:parameter name="realm"
context="G"
type="string"
- basic="1" advanced="1" wizard="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/base/serverservices.xml b/docs-xml/smbdotconf/base/serverservices.xml
index e02e29d..dba65e9 100644
--- a/docs-xml/smbdotconf/base/serverservices.xml
+++ b/docs-xml/smbdotconf/base/serverservices.xml
@@ -1,7 +1,6 @@
<samba:parameter name="server services"
context="G"
type="list"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option contains the services that the Samba daemon will
diff --git a/docs-xml/smbdotconf/base/serverstring.xml b/docs-xml/smbdotconf/base/serverstring.xml
index 504ed9c..f6bc808 100644
--- a/docs-xml/smbdotconf/base/serverstring.xml
+++ b/docs-xml/smbdotconf/base/serverstring.xml
@@ -1,7 +1,6 @@
<samba:parameter name="server string"
context="G"
type="string"
- basic="1" advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This controls what string will show up in the printer comment box in print
diff --git a/docs-xml/smbdotconf/base/unixcharset.xml b/docs-xml/smbdotconf/base/unixcharset.xml
index 9fe5996..ff8f6bb 100644
--- a/docs-xml/smbdotconf/base/unixcharset.xml
+++ b/docs-xml/smbdotconf/base/unixcharset.xml
@@ -1,7 +1,6 @@
<samba:parameter name="unix charset"
context="G"
type="string"
- advanced="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/base/workgroup.xml b/docs-xml/smbdotconf/base/workgroup.xml
index 9d6f267..49aec41 100644
--- a/docs-xml/smbdotconf/base/workgroup.xml
+++ b/docs-xml/smbdotconf/base/workgroup.xml
@@ -1,7 +1,6 @@
<samba:parameter name="workgroup"
context="G"
type="string"
- basic="1" advanced="1" wizard="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
--
2.1.0
From 8af1eef7b4b68e75af55b66292cca98b2bee43ef Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 28 Apr 2015 22:37:25 +0200
Subject: [PATCH 08/22] docs:smbdotconf: remove swat-specific flags from
browse/
Signed-off-by: Michael Adam <obnox at samba.org>
---
docs-xml/smbdotconf/browse/browseable.xml | 1 -
docs-xml/smbdotconf/browse/browselist.xml | 1 -
docs-xml/smbdotconf/browse/domainmaster.xml | 1 -
docs-xml/smbdotconf/browse/enhancedbrowsing.xml | 1 -
docs-xml/smbdotconf/browse/lmannounce.xml | 1 -
docs-xml/smbdotconf/browse/lminterval.xml | 1 -
docs-xml/smbdotconf/browse/localmaster.xml | 1 -
docs-xml/smbdotconf/browse/oslevel.xml | 1 -
docs-xml/smbdotconf/browse/preferredmaster.xml | 1 -
9 files changed, 9 deletions(-)
diff --git a/docs-xml/smbdotconf/browse/browseable.xml b/docs-xml/smbdotconf/browse/browseable.xml
index e58e191..c56d3fc 100644
--- a/docs-xml/smbdotconf/browse/browseable.xml
+++ b/docs-xml/smbdotconf/browse/browseable.xml
@@ -1,5 +1,4 @@
<samba:parameter name="browseable" context="S" type="boolean"
- basic="1" advanced="1" print="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>browsable</synonym>
<description>
diff --git a/docs-xml/smbdotconf/browse/browselist.xml b/docs-xml/smbdotconf/browse/browselist.xml
index dd858b7..adf7454 100644
--- a/docs-xml/smbdotconf/browse/browselist.xml
+++ b/docs-xml/smbdotconf/browse/browselist.xml
@@ -1,7 +1,6 @@
<samba:parameter name="browse list"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This controls whether <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/browse/domainmaster.xml b/docs-xml/smbdotconf/browse/domainmaster.xml
index 2325b62..a47800b 100644
--- a/docs-xml/smbdotconf/browse/domainmaster.xml
+++ b/docs-xml/smbdotconf/browse/domainmaster.xml
@@ -1,7 +1,6 @@
<samba:parameter name="domain master"
type="enum"
context="G"
- basic="1" advanced="1" developer="1"
function="_domain_master"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/browse/enhancedbrowsing.xml b/docs-xml/smbdotconf/browse/enhancedbrowsing.xml
index 7f85616..8b1b531 100644
--- a/docs-xml/smbdotconf/browse/enhancedbrowsing.xml
+++ b/docs-xml/smbdotconf/browse/enhancedbrowsing.xml
@@ -1,6 +1,5 @@
<samba:parameter name="enhanced browsing"
context="G"
- advanced="1" developer="1"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/browse/lmannounce.xml b/docs-xml/smbdotconf/browse/lmannounce.xml
index d0b4b2e..6d712c4 100644
--- a/docs-xml/smbdotconf/browse/lmannounce.xml
+++ b/docs-xml/smbdotconf/browse/lmannounce.xml
@@ -1,7 +1,6 @@
<samba:parameter name="lm announce"
context="G"
type="enum"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter determines if <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/browse/lminterval.xml b/docs-xml/smbdotconf/browse/lminterval.xml
index 4f38165..8a68e09 100644
--- a/docs-xml/smbdotconf/browse/lminterval.xml
+++ b/docs-xml/smbdotconf/browse/lminterval.xml
@@ -1,6 +1,5 @@
<samba:parameter name="lm interval"
context="G"
- advanced="1" developer="1"
type="integer"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/browse/localmaster.xml b/docs-xml/smbdotconf/browse/localmaster.xml
index bdabf62..65a288d 100644
--- a/docs-xml/smbdotconf/browse/localmaster.xml
+++ b/docs-xml/smbdotconf/browse/localmaster.xml
@@ -1,7 +1,6 @@
<samba:parameter name="local master"
context="G"
type="boolean"
- basic="1" advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option allows <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/browse/oslevel.xml b/docs-xml/smbdotconf/browse/oslevel.xml
index 1081597..fc386d2 100644
--- a/docs-xml/smbdotconf/browse/oslevel.xml
+++ b/docs-xml/smbdotconf/browse/oslevel.xml
@@ -1,7 +1,6 @@
<samba:parameter name="os level"
context="G"
type="integer"
- basic="1" advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/browse/preferredmaster.xml b/docs-xml/smbdotconf/browse/preferredmaster.xml
index 88dafd2..e32ca52 100644
--- a/docs-xml/smbdotconf/browse/preferredmaster.xml
+++ b/docs-xml/smbdotconf/browse/preferredmaster.xml
@@ -1,7 +1,6 @@
<samba:parameter name="preferred master"
context="G"
type="boolean-auto"
- basic="1" advanced="1" developer="1"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>prefered master</synonym>
--
2.1.0
From c07f71babf8d6365189b93c92d3c46980900482e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 28 Apr 2015 22:39:13 +0200
Subject: [PATCH 09/22] docs:smbdotconf: remove swat-specific flags from
domain/
Signed-off-by: Michael Adam <obnox at samba.org>
---
docs-xml/smbdotconf/domain/dnsupdatecommand.xml | 1 -
docs-xml/smbdotconf/domain/machinepasswordtimeout.xml | 1 -
docs-xml/smbdotconf/domain/nsupdatecommand.xml | 1 -
docs-xml/smbdotconf/domain/rndccommand.xml | 1 -
docs-xml/smbdotconf/domain/spnupdatecommand.xml | 1 -
5 files changed, 5 deletions(-)
diff --git a/docs-xml/smbdotconf/domain/dnsupdatecommand.xml b/docs-xml/smbdotconf/domain/dnsupdatecommand.xml
index 38fa831..70c311e 100644
--- a/docs-xml/smbdotconf/domain/dnsupdatecommand.xml
+++ b/docs-xml/smbdotconf/domain/dnsupdatecommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="dns update command"
context="G"
type="list"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option sets the command that is called when there are
diff --git a/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml b/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml
index a8e312b..b53ee3c 100644
--- a/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml
+++ b/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml
@@ -1,7 +1,6 @@
<samba:parameter name="machine password timeout"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/domain/nsupdatecommand.xml b/docs-xml/smbdotconf/domain/nsupdatecommand.xml
index 5f55ddf..9481058 100644
--- a/docs-xml/smbdotconf/domain/nsupdatecommand.xml
+++ b/docs-xml/smbdotconf/domain/nsupdatecommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="nsupdate command"
context="G"
type="list"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option sets the path to the <filename>nsupdate</filename>
diff --git a/docs-xml/smbdotconf/domain/rndccommand.xml b/docs-xml/smbdotconf/domain/rndccommand.xml
index 1d88a9b..72df82f 100644
--- a/docs-xml/smbdotconf/domain/rndccommand.xml
+++ b/docs-xml/smbdotconf/domain/rndccommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="rndc command"
context="G"
type="list"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option specifies the path to the name server control utility.
diff --git a/docs-xml/smbdotconf/domain/spnupdatecommand.xml b/docs-xml/smbdotconf/domain/spnupdatecommand.xml
index b1d4a85..cbeb657 100644
--- a/docs-xml/smbdotconf/domain/spnupdatecommand.xml
+++ b/docs-xml/smbdotconf/domain/spnupdatecommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="spn update command"
context="G"
type="list"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option sets the command that for updating
--
2.1.0
From 906db3d1b93e5f54b6770f1f4a992572e0158375 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 28 Apr 2015 22:46:21 +0200
Subject: [PATCH 10/22] docs:smbdotconf: remove swat-specific flags from
filename/
Signed-off-by: Michael Adam <obnox at samba.org>
---
docs-xml/smbdotconf/filename/mangleprefix.xml | 1 -
docs-xml/smbdotconf/filename/manglingmethod.xml | 1 -
docs-xml/smbdotconf/filename/maxstatcachesize.xml | 1 -
docs-xml/smbdotconf/filename/statcache.xml | 1 -
4 files changed, 4 deletions(-)
diff --git a/docs-xml/smbdotconf/filename/mangleprefix.xml b/docs-xml/smbdotconf/filename/mangleprefix.xml
index 192fb67..96ff963 100644
--- a/docs-xml/smbdotconf/filename/mangleprefix.xml
+++ b/docs-xml/smbdotconf/filename/mangleprefix.xml
@@ -1,7 +1,6 @@
<samba:parameter name="mangle prefix"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para> controls the number of prefix
diff --git a/docs-xml/smbdotconf/filename/manglingmethod.xml b/docs-xml/smbdotconf/filename/manglingmethod.xml
index 347dc56..4b68067 100644
--- a/docs-xml/smbdotconf/filename/manglingmethod.xml
+++ b/docs-xml/smbdotconf/filename/manglingmethod.xml
@@ -1,7 +1,6 @@
<samba:parameter name="mangling method"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para> controls the algorithm used for the generating
diff --git a/docs-xml/smbdotconf/filename/maxstatcachesize.xml b/docs-xml/smbdotconf/filename/maxstatcachesize.xml
index d341beb..40790df 100644
--- a/docs-xml/smbdotconf/filename/maxstatcachesize.xml
+++ b/docs-xml/smbdotconf/filename/maxstatcachesize.xml
@@ -1,6 +1,5 @@
<samba:parameter name="max stat cache size"
context="G"
- developer="1"
type="integer"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/filename/statcache.xml b/docs-xml/smbdotconf/filename/statcache.xml
index c38fb11..ec1ee25 100644
--- a/docs-xml/smbdotconf/filename/statcache.xml
+++ b/docs-xml/smbdotconf/filename/statcache.xml
@@ -1,6 +1,5 @@
<samba:parameter name="stat cache"
context="G"
- developer="1"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
--
2.1.0
From 4dc1e978edc2fe4ed1d1f6fdc4a352247ef6e28b Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 28 Apr 2015 22:51:05 +0200
Subject: [PATCH 11/22] docs:smbdotconf: remove swat-specific flags from ldap/
Signed-off-by: Michael Adam <obnox at samba.org>
---
docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml | 1 -
docs-xml/smbdotconf/ldap/ldapadmindn.xml | 1 -
docs-xml/smbdotconf/ldap/ldapconnectiontimeout.xml | 1 -
docs-xml/smbdotconf/ldap/ldapdeletedn.xml | 1 -
docs-xml/smbdotconf/ldap/ldapderef.xml | 1 -
docs-xml/smbdotconf/ldap/ldapfollowreferral.xml | 1 -
docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml | 1 -
docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml | 1 -
docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml | 2 --
docs-xml/smbdotconf/ldap/ldappagesize.xml | 1 -
docs-xml/smbdotconf/ldap/ldappasswdsync.xml | 2 --
docs-xml/smbdotconf/ldap/ldapreplicationsleep.xml | 1 -
docs-xml/smbdotconf/ldap/ldapsameditposix.xml | 1 -
docs-xml/smbdotconf/ldap/ldapsamtrusted.xml | 1 -
docs-xml/smbdotconf/ldap/ldapssl.xml | 1 -
docs-xml/smbdotconf/ldap/ldapsslads.xml | 1 -
docs-xml/smbdotconf/ldap/ldapsuffix.xml | 1 -
docs-xml/smbdotconf/ldap/ldaptimeout.xml | 1 -
docs-xml/smbdotconf/ldap/ldapusersuffix.xml | 1 -
19 files changed, 21 deletions(-)
diff --git a/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml b/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
index e0ce700..92ea541 100644
--- a/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
+++ b/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
@@ -1,7 +1,6 @@
<samba:parameter name="client ldap sasl wrapping"
context="G"
type="enum"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/ldap/ldapadmindn.xml b/docs-xml/smbdotconf/ldap/ldapadmindn.xml
index 442d242..3f50799 100644
--- a/docs-xml/smbdotconf/ldap/ldapadmindn.xml
+++ b/docs-xml/smbdotconf/ldap/ldapadmindn.xml
@@ -1,6 +1,5 @@
<samba:parameter name="ldap admin dn"
context="G"
- advanced="1" developer="1"
type="string"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/ldap/ldapconnectiontimeout.xml b/docs-xml/smbdotconf/ldap/ldapconnectiontimeout.xml
index 31713c9..7c77fe3 100644
--- a/docs-xml/smbdotconf/ldap/ldapconnectiontimeout.xml
+++ b/docs-xml/smbdotconf/ldap/ldapconnectiontimeout.xml
@@ -1,6 +1,5 @@
<samba:parameter name="ldap connection timeout"
context="G"
- advanced="1" developer="1"
type="integer"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/ldap/ldapdeletedn.xml b/docs-xml/smbdotconf/ldap/ldapdeletedn.xml
index 48f5c9b..a9518d1 100644
--- a/docs-xml/smbdotconf/ldap/ldapdeletedn.xml
+++ b/docs-xml/smbdotconf/ldap/ldapdeletedn.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ldap delete dn"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para> This parameter specifies whether a delete
diff --git a/docs-xml/smbdotconf/ldap/ldapderef.xml b/docs-xml/smbdotconf/ldap/ldapderef.xml
index d102f51..23ad3e7 100644
--- a/docs-xml/smbdotconf/ldap/ldapderef.xml
+++ b/docs-xml/smbdotconf/ldap/ldapderef.xml
@@ -1,5 +1,4 @@
<samba:parameter name="ldap deref" context="G" type="enum"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml b/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
index 4c43b5b..ebdfb89 100644
--- a/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
+++ b/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
@@ -1,5 +1,4 @@
<samba:parameter name="ldap follow referral" context="G" type="enum"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml b/docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml
index a82c870..bb18832 100644
--- a/docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ldap group suffix"
context="G"
type="string"
- advanced="1" developer="1"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml b/docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml
index 79c93cb..aac09df 100644
--- a/docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml
@@ -1,6 +1,5 @@
<samba:parameter name="ldap idmap suffix"
context="G"
- advanced="1" developer="1"
type="string"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml b/docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml
index f4149c7..2572246 100644
--- a/docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml
@@ -1,7 +1,5 @@
<samba:parameter name="ldap machine suffix"
context="G"
- advanced="1"
- developer="1"
type="string"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/ldap/ldappagesize.xml b/docs-xml/smbdotconf/ldap/ldappagesize.xml
index bc09b98..311eba1 100644
--- a/docs-xml/smbdotconf/ldap/ldappagesize.xml
+++ b/docs-xml/smbdotconf/ldap/ldappagesize.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ldap page size"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/ldap/ldappasswdsync.xml b/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
index 8c7dea6..7166e9b 100644
--- a/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
+++ b/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
@@ -1,7 +1,5 @@
<samba:parameter name="ldap passwd sync"
context="G"
- advanced="1"
- developer="1"
type="enum"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/ldap/ldapreplicationsleep.xml b/docs-xml/smbdotconf/ldap/ldapreplicationsleep.xml
index 4710e2b..a8236d8 100644
--- a/docs-xml/smbdotconf/ldap/ldapreplicationsleep.xml
+++ b/docs-xml/smbdotconf/ldap/ldapreplicationsleep.xml
@@ -1,6 +1,5 @@
<samba:parameter name="ldap replication sleep"
context="G"
- advanced="1" developer="1"
type="integer"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/ldap/ldapsameditposix.xml b/docs-xml/smbdotconf/ldap/ldapsameditposix.xml
index bf61119..6496bfb 100644
--- a/docs-xml/smbdotconf/ldap/ldapsameditposix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapsameditposix.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ldapsam:editposix"
context="G"
type="string"
- advanced="1" developer="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/ldap/ldapsamtrusted.xml b/docs-xml/smbdotconf/ldap/ldapsamtrusted.xml
index 2e4e1db..4556679 100644
--- a/docs-xml/smbdotconf/ldap/ldapsamtrusted.xml
+++ b/docs-xml/smbdotconf/ldap/ldapsamtrusted.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ldapsam:trusted"
context="G"
type="string"
- advanced="1" developer="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml
index fa7fea9..eade027 100644
--- a/docs-xml/smbdotconf/ldap/ldapssl.xml
+++ b/docs-xml/smbdotconf/ldap/ldapssl.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ldap ssl"
context="G"
type="enum"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option is used to define whether or not Samba should
diff --git a/docs-xml/smbdotconf/ldap/ldapsslads.xml b/docs-xml/smbdotconf/ldap/ldapsslads.xml
index e6998cb..4f1771a 100644
--- a/docs-xml/smbdotconf/ldap/ldapsslads.xml
+++ b/docs-xml/smbdotconf/ldap/ldapsslads.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ldap ssl ads"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option is used to define whether or not Samba should
diff --git a/docs-xml/smbdotconf/ldap/ldapsuffix.xml b/docs-xml/smbdotconf/ldap/ldapsuffix.xml
index 4859513..7db13c2 100644
--- a/docs-xml/smbdotconf/ldap/ldapsuffix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapsuffix.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ldap suffix"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Specifies the base for all ldap suffixes and for storing the sambaDomain object.</para>
diff --git a/docs-xml/smbdotconf/ldap/ldaptimeout.xml b/docs-xml/smbdotconf/ldap/ldaptimeout.xml
index 5bc2699..e920ddc 100644
--- a/docs-xml/smbdotconf/ldap/ldaptimeout.xml
+++ b/docs-xml/smbdotconf/ldap/ldaptimeout.xml
@@ -1,6 +1,5 @@
<samba:parameter name="ldap timeout"
context="G"
- advanced="1" developer="1"
type="integer"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/ldap/ldapusersuffix.xml b/docs-xml/smbdotconf/ldap/ldapusersuffix.xml
index 996bb85..71fdc9e 100644
--- a/docs-xml/smbdotconf/ldap/ldapusersuffix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapusersuffix.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ldap user suffix"
context="G"
type="string"
- advanced="1" developer="1"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
--
2.1.0
From 205d4f20b5674fa2b3035b7ac51cb9db1ae35bfc Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 28 Apr 2015 22:57:15 +0200
Subject: [PATCH 12/22] docs:smbdotconf: remove swat-specific flags from
logging/
Signed-off-by: Michael Adam <obnox at samba.org>
---
docs-xml/smbdotconf/logging/debugclass.xml | 1 -
docs-xml/smbdotconf/logging/debughirestimestamp.xml | 1 -
docs-xml/smbdotconf/logging/debugpid.xml | 1 -
docs-xml/smbdotconf/logging/debugprefixtimestamp.xml | 1 -
docs-xml/smbdotconf/logging/debugtimestamp.xml | 1 -
docs-xml/smbdotconf/logging/debuguid.xml | 1 -
docs-xml/smbdotconf/logging/ldapdebuglevel.xml | 1 -
docs-xml/smbdotconf/logging/ldapdebugthreshold.xml | 1 -
docs-xml/smbdotconf/logging/logfile.xml | 1 -
docs-xml/smbdotconf/logging/logging.xml | 1 -
docs-xml/smbdotconf/logging/loglevel.xml | 1 -
docs-xml/smbdotconf/logging/maxlogsize.xml | 1 -
docs-xml/smbdotconf/logging/syslog.xml | 1 -
docs-xml/smbdotconf/logging/syslogonly.xml | 1 -
14 files changed, 14 deletions(-)
diff --git a/docs-xml/smbdotconf/logging/debugclass.xml b/docs-xml/smbdotconf/logging/debugclass.xml
index cc4b84a..b9ffbe3 100644
--- a/docs-xml/smbdotconf/logging/debugclass.xml
+++ b/docs-xml/smbdotconf/logging/debugclass.xml
@@ -1,7 +1,6 @@
<samba:parameter name="debug class"
context="G"
type="boolean"
- developer="1" advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/logging/debughirestimestamp.xml b/docs-xml/smbdotconf/logging/debughirestimestamp.xml
index 6cc7b71..5c9e468 100644
--- a/docs-xml/smbdotconf/logging/debughirestimestamp.xml
+++ b/docs-xml/smbdotconf/logging/debughirestimestamp.xml
@@ -1,6 +1,5 @@
<samba:parameter name="debug hires timestamp"
context="G"
- developer="1"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/logging/debugpid.xml b/docs-xml/smbdotconf/logging/debugpid.xml
index 017d010..5c81625 100644
--- a/docs-xml/smbdotconf/logging/debugpid.xml
+++ b/docs-xml/smbdotconf/logging/debugpid.xml
@@ -1,7 +1,6 @@
<samba:parameter name="debug pid"
context="G"
type="boolean"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/logging/debugprefixtimestamp.xml b/docs-xml/smbdotconf/logging/debugprefixtimestamp.xml
index 62a6574..e894142 100644
--- a/docs-xml/smbdotconf/logging/debugprefixtimestamp.xml
+++ b/docs-xml/smbdotconf/logging/debugprefixtimestamp.xml
@@ -1,6 +1,5 @@
<samba:parameter name="debug prefix timestamp"
context="G"
- developer="1"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/logging/debugtimestamp.xml b/docs-xml/smbdotconf/logging/debugtimestamp.xml
index b50f429..205eac8 100644
--- a/docs-xml/smbdotconf/logging/debugtimestamp.xml
+++ b/docs-xml/smbdotconf/logging/debugtimestamp.xml
@@ -1,7 +1,6 @@
<samba:parameter name="debug timestamp"
context="G"
type="boolean"
- developer="1"
function="timestamp_logs"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>timestamp logs</synonym>
diff --git a/docs-xml/smbdotconf/logging/debuguid.xml b/docs-xml/smbdotconf/logging/debuguid.xml
index 5cfa541..cc715ec 100644
--- a/docs-xml/smbdotconf/logging/debuguid.xml
+++ b/docs-xml/smbdotconf/logging/debuguid.xml
@@ -1,7 +1,6 @@
<samba:parameter name="debug uid"
context="G"
type="boolean"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/logging/ldapdebuglevel.xml b/docs-xml/smbdotconf/logging/ldapdebuglevel.xml
index a8c47e4..1b51767 100644
--- a/docs-xml/smbdotconf/logging/ldapdebuglevel.xml
+++ b/docs-xml/smbdotconf/logging/ldapdebuglevel.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ldap debug level"
type="integer"
context="G"
- developer="1" advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml b/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml
index e023ff6..ab69cc5 100644
--- a/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml
+++ b/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ldap debug threshold"
type="integer"
context="G"
- developer="1" advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/logging/logfile.xml b/docs-xml/smbdotconf/logging/logfile.xml
index a117454..4a7be66 100644
--- a/docs-xml/smbdotconf/logging/logfile.xml
+++ b/docs-xml/smbdotconf/logging/logfile.xml
@@ -1,7 +1,6 @@
<samba:parameter name="log file"
context="G"
type="string"
- developer="1" advanced="1"
function="logfile"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/logging/logging.xml b/docs-xml/smbdotconf/logging/logging.xml
index a82496b..f779d8f 100644
--- a/docs-xml/smbdotconf/logging/logging.xml
+++ b/docs-xml/smbdotconf/logging/logging.xml
@@ -1,7 +1,6 @@
<samba:parameter name="logging"
type="string"
context="G"
- developer="1" advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/logging/loglevel.xml b/docs-xml/smbdotconf/logging/loglevel.xml
index d5562f4..6a22554 100644
--- a/docs-xml/smbdotconf/logging/loglevel.xml
+++ b/docs-xml/smbdotconf/logging/loglevel.xml
@@ -1,7 +1,6 @@
<samba:parameter name="log level"
type="string"
context="G"
- developer="1" advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>debuglevel</synonym>
<description>
diff --git a/docs-xml/smbdotconf/logging/maxlogsize.xml b/docs-xml/smbdotconf/logging/maxlogsize.xml
index 3d5239c..3373f16 100644
--- a/docs-xml/smbdotconf/logging/maxlogsize.xml
+++ b/docs-xml/smbdotconf/logging/maxlogsize.xml
@@ -1,7 +1,6 @@
<samba:parameter name="max log size"
type="integer"
context="G"
- developer="1" advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/logging/syslog.xml b/docs-xml/smbdotconf/logging/syslog.xml
index f58a9a5..23ca499 100644
--- a/docs-xml/smbdotconf/logging/syslog.xml
+++ b/docs-xml/smbdotconf/logging/syslog.xml
@@ -1,7 +1,6 @@
<samba:parameter name="syslog"
context="G"
type="integer"
- developer="1" advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/logging/syslogonly.xml b/docs-xml/smbdotconf/logging/syslogonly.xml
index aec40c2..9847f0c 100644
--- a/docs-xml/smbdotconf/logging/syslogonly.xml
+++ b/docs-xml/smbdotconf/logging/syslogonly.xml
@@ -1,7 +1,6 @@
<samba:parameter name="syslog only"
context="G"
type="boolean"
- developer="1" advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
--
2.1.0
From 42fd8d0abe5a25a249aaaa6ee67cf7e163a38661 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 28 Apr 2015 23:02:25 +0200
Subject: [PATCH 13/22] docs:smbdotconf: remove swat-specific flags from logon/
Signed-off-by: Michael Adam <obnox at samba.org>
---
docs-xml/smbdotconf/logon/abortshutdownscript.xml | 1 -
docs-xml/smbdotconf/logon/addgroupscript.xml | 1 -
docs-xml/smbdotconf/logon/addmachinescript.xml | 1 -
docs-xml/smbdotconf/logon/adduserscript.xml | 1 -
docs-xml/smbdotconf/logon/addusertogroupscript.xml | 1 -
docs-xml/smbdotconf/logon/allownt4crypto.xml | 1 -
docs-xml/smbdotconf/logon/deletegroupscript.xml | 1 -
docs-xml/smbdotconf/logon/deleteuserfromgroupscript.xml | 1 -
docs-xml/smbdotconf/logon/deleteuserscript.xml | 1 -
docs-xml/smbdotconf/logon/domainlogons.xml | 1 -
docs-xml/smbdotconf/logon/enableprivileges.xml | 1 -
docs-xml/smbdotconf/logon/initlogondelay.xml | 1 -
docs-xml/smbdotconf/logon/initlogondelayedhosts.xml | 1 -
docs-xml/smbdotconf/logon/logondrive.xml | 1 -
docs-xml/smbdotconf/logon/logonhome.xml | 1 -
docs-xml/smbdotconf/logon/logonpath.xml | 1 -
docs-xml/smbdotconf/logon/logonscript.xml | 1 -
docs-xml/smbdotconf/logon/rejectmd5clients.xml | 1 -
docs-xml/smbdotconf/logon/setprimarygroupscript.xml | 1 -
docs-xml/smbdotconf/logon/shutdownscript.xml | 1 -
20 files changed, 20 deletions(-)
diff --git a/docs-xml/smbdotconf/logon/abortshutdownscript.xml b/docs-xml/smbdotconf/logon/abortshutdownscript.xml
index 56bd35f..d5f7142 100644
--- a/docs-xml/smbdotconf/logon/abortshutdownscript.xml
+++ b/docs-xml/smbdotconf/logon/abortshutdownscript.xml
@@ -1,6 +1,5 @@
<samba:parameter name="abort shutdown script"
context="G"
- advanced="1" developer="1"
type="string"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/logon/addgroupscript.xml b/docs-xml/smbdotconf/logon/addgroupscript.xml
index 3804e14..18d7230 100644
--- a/docs-xml/smbdotconf/logon/addgroupscript.xml
+++ b/docs-xml/smbdotconf/logon/addgroupscript.xml
@@ -1,7 +1,6 @@
<samba:parameter name="add group script"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/logon/addmachinescript.xml b/docs-xml/smbdotconf/logon/addmachinescript.xml
index c06a4a9..5d88170 100644
--- a/docs-xml/smbdotconf/logon/addmachinescript.xml
+++ b/docs-xml/smbdotconf/logon/addmachinescript.xml
@@ -1,7 +1,6 @@
<samba:parameter name="add machine script"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/logon/adduserscript.xml b/docs-xml/smbdotconf/logon/adduserscript.xml
index d8abcda..981d670 100644
--- a/docs-xml/smbdotconf/logon/adduserscript.xml
+++ b/docs-xml/smbdotconf/logon/adduserscript.xml
@@ -1,7 +1,6 @@
<samba:parameter name="add user script"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/logon/addusertogroupscript.xml b/docs-xml/smbdotconf/logon/addusertogroupscript.xml
index f7eb410..d871ead 100644
--- a/docs-xml/smbdotconf/logon/addusertogroupscript.xml
+++ b/docs-xml/smbdotconf/logon/addusertogroupscript.xml
@@ -1,7 +1,6 @@
<samba:parameter name="add user to group script"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/logon/allownt4crypto.xml b/docs-xml/smbdotconf/logon/allownt4crypto.xml
index 4d417c7..03dc8fa 100644
--- a/docs-xml/smbdotconf/logon/allownt4crypto.xml
+++ b/docs-xml/smbdotconf/logon/allownt4crypto.xml
@@ -1,7 +1,6 @@
<samba:parameter name="allow nt4 crypto"
context="G"
type="boolean"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option controls whether the netlogon server (currently
diff --git a/docs-xml/smbdotconf/logon/deletegroupscript.xml b/docs-xml/smbdotconf/logon/deletegroupscript.xml
index bd265b7..8f28450 100644
--- a/docs-xml/smbdotconf/logon/deletegroupscript.xml
+++ b/docs-xml/smbdotconf/logon/deletegroupscript.xml
@@ -1,7 +1,6 @@
<samba:parameter name="delete group script"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This is the full pathname to a script that will
diff --git a/docs-xml/smbdotconf/logon/deleteuserfromgroupscript.xml b/docs-xml/smbdotconf/logon/deleteuserfromgroupscript.xml
index a685ab5..07a21a7 100644
--- a/docs-xml/smbdotconf/logon/deleteuserfromgroupscript.xml
+++ b/docs-xml/smbdotconf/logon/deleteuserfromgroupscript.xml
@@ -1,7 +1,6 @@
<samba:parameter name="delete user from group script"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Full path to the script that will be called when
diff --git a/docs-xml/smbdotconf/logon/deleteuserscript.xml b/docs-xml/smbdotconf/logon/deleteuserscript.xml
index b3abe23..128fa89 100644
--- a/docs-xml/smbdotconf/logon/deleteuserscript.xml
+++ b/docs-xml/smbdotconf/logon/deleteuserscript.xml
@@ -1,7 +1,6 @@
<samba:parameter name="delete user script"
type="string"
context="G"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This is the full pathname to a script that will
diff --git a/docs-xml/smbdotconf/logon/domainlogons.xml b/docs-xml/smbdotconf/logon/domainlogons.xml
index 9d2da35..0a1d11d 100644
--- a/docs-xml/smbdotconf/logon/domainlogons.xml
+++ b/docs-xml/smbdotconf/logon/domainlogons.xml
@@ -1,7 +1,6 @@
<samba:parameter name="domain logons"
context="G"
type="boolean"
- advanced="1" developer="1"
function="_domain_logons"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/logon/enableprivileges.xml b/docs-xml/smbdotconf/logon/enableprivileges.xml
index 0fbc504..be9b5f7 100644
--- a/docs-xml/smbdotconf/logon/enableprivileges.xml
+++ b/docs-xml/smbdotconf/logon/enableprivileges.xml
@@ -1,7 +1,6 @@
<samba:parameter name="enable privileges"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/logon/initlogondelay.xml b/docs-xml/smbdotconf/logon/initlogondelay.xml
index de8b19e..0cdbcd0 100644
--- a/docs-xml/smbdotconf/logon/initlogondelay.xml
+++ b/docs-xml/smbdotconf/logon/initlogondelay.xml
@@ -1,7 +1,6 @@
<samba:parameter name="init logon delay"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/logon/initlogondelayedhosts.xml b/docs-xml/smbdotconf/logon/initlogondelayedhosts.xml
index 2756a63..12d91cc 100644
--- a/docs-xml/smbdotconf/logon/initlogondelayedhosts.xml
+++ b/docs-xml/smbdotconf/logon/initlogondelayedhosts.xml
@@ -1,7 +1,6 @@
<samba:parameter name="init logon delayed hosts"
context="G"
type="list"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/logon/logondrive.xml b/docs-xml/smbdotconf/logon/logondrive.xml
index 566480b..dc12080 100644
--- a/docs-xml/smbdotconf/logon/logondrive.xml
+++ b/docs-xml/smbdotconf/logon/logondrive.xml
@@ -1,7 +1,6 @@
<samba:parameter name="logon drive"
context="G"
type="string"
- advanced="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/logon/logonhome.xml b/docs-xml/smbdotconf/logon/logonhome.xml
index bcab4a8..3e9d150 100644
--- a/docs-xml/smbdotconf/logon/logonhome.xml
+++ b/docs-xml/smbdotconf/logon/logonhome.xml
@@ -1,7 +1,6 @@
<samba:parameter name="logon home"
context="G"
type="string"
- advanced="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/logon/logonpath.xml b/docs-xml/smbdotconf/logon/logonpath.xml
index 662a1c1..d9ffbcb 100644
--- a/docs-xml/smbdotconf/logon/logonpath.xml
+++ b/docs-xml/smbdotconf/logon/logonpath.xml
@@ -1,7 +1,6 @@
<samba:parameter name="logon path"
context="G"
type="string"
- advanced="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/logon/logonscript.xml b/docs-xml/smbdotconf/logon/logonscript.xml
index 102fb42..b6d7580 100644
--- a/docs-xml/smbdotconf/logon/logonscript.xml
+++ b/docs-xml/smbdotconf/logon/logonscript.xml
@@ -1,6 +1,5 @@
<samba:parameter name="logon script"
context="G"
- advanced="1" developer="1"
type="string"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/logon/rejectmd5clients.xml b/docs-xml/smbdotconf/logon/rejectmd5clients.xml
index 04a5b4d..41684ef 100644
--- a/docs-xml/smbdotconf/logon/rejectmd5clients.xml
+++ b/docs-xml/smbdotconf/logon/rejectmd5clients.xml
@@ -1,7 +1,6 @@
<samba:parameter name="reject md5 clients"
context="G"
type="boolean"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option controls whether the netlogon server (currently
diff --git a/docs-xml/smbdotconf/logon/setprimarygroupscript.xml b/docs-xml/smbdotconf/logon/setprimarygroupscript.xml
index 3108ac6..60d2cae 100644
--- a/docs-xml/smbdotconf/logon/setprimarygroupscript.xml
+++ b/docs-xml/smbdotconf/logon/setprimarygroupscript.xml
@@ -1,7 +1,6 @@
<samba:parameter name="set primary group script"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/logon/shutdownscript.xml b/docs-xml/smbdotconf/logon/shutdownscript.xml
index e1cc724..e66ed92 100644
--- a/docs-xml/smbdotconf/logon/shutdownscript.xml
+++ b/docs-xml/smbdotconf/logon/shutdownscript.xml
@@ -1,7 +1,6 @@
<samba:parameter name="shutdown script"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This a full path name to a script called by
--
2.1.0
From 25c40e9c80f241ea193cb849a1cf0808a8affab7 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 28 Apr 2015 23:21:37 +0200
Subject: [PATCH 14/22] docs:smbdotconf: remove swat-specific flags from misc/
Signed-off-by: Michael Adam <obnox at samba.org>
---
docs-xml/smbdotconf/misc/addsharecommand.xml | 1 -
docs-xml/smbdotconf/misc/afsshare.xml | 1 -
docs-xml/smbdotconf/misc/afstokenlifetime.xml | 1 -
docs-xml/smbdotconf/misc/afsusernamemap.xml | 1 -
docs-xml/smbdotconf/misc/asyncsmbechohandler.xml | 1 -
docs-xml/smbdotconf/misc/available.xml | 1 -
docs-xml/smbdotconf/misc/cachedirectory.xml | 1 -
docs-xml/smbdotconf/misc/changenotify.xml | 1 -
docs-xml/smbdotconf/misc/changesharecommand.xml | 1 -
docs-xml/smbdotconf/misc/clusteraddresses.xml | 1 -
docs-xml/smbdotconf/misc/clustering.xml | 1 -
docs-xml/smbdotconf/misc/configfile.xml | 1 -
docs-xml/smbdotconf/misc/copy.xml | 2 +-
docs-xml/smbdotconf/misc/ctdbdsocket.xml | 1 -
docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml | 1 -
docs-xml/smbdotconf/misc/ctdbtimeout.xml | 1 -
docs-xml/smbdotconf/misc/defaultservice.xml | 1 -
docs-xml/smbdotconf/misc/deletesharecommand.xml | 1 -
docs-xml/smbdotconf/misc/dfreecachetime.xml | 1 -
docs-xml/smbdotconf/misc/dfreecommand.xml | 1 -
docs-xml/smbdotconf/misc/directorynamecachesize.xml | 1 -
docs-xml/smbdotconf/misc/dmapisupport.xml | 1 -
docs-xml/smbdotconf/misc/fssprunestale.xml | 1 -
docs-xml/smbdotconf/misc/fsssequencetimeout.xml | 1 -
docs-xml/smbdotconf/misc/homedirmap.xml | 1 -
docs-xml/smbdotconf/misc/include.xml | 1 -
docs-xml/smbdotconf/misc/kernelchangenotify.xml | 1 -
docs-xml/smbdotconf/misc/lockdirectory.xml | 1 -
docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml | 1 -
docs-xml/smbdotconf/misc/messagecommand.xml | 1 -
docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml | 1 -
docs-xml/smbdotconf/misc/ncalrpcdir.xml | 1 -
docs-xml/smbdotconf/misc/nishomedir.xml | 1 -
docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml | 1 -
docs-xml/smbdotconf/misc/panicaction.xml | 1 -
docs-xml/smbdotconf/misc/perfcountmodule.xml | 1 -
docs-xml/smbdotconf/misc/piddirectory.xml | 1 -
docs-xml/smbdotconf/misc/postexec.xml | 1 -
docs-xml/smbdotconf/misc/preexec.xml | 1 -
docs-xml/smbdotconf/misc/preexecclose.xml | 1 -
docs-xml/smbdotconf/misc/preload.xml | 1 -
docs-xml/smbdotconf/misc/registryshares.xml | 1 -
docs-xml/smbdotconf/misc/remoteannounce.xml | 1 -
docs-xml/smbdotconf/misc/remotebrowsesync.xml | 1 -
docs-xml/smbdotconf/misc/resetonzerovc.xml | 1 -
docs-xml/smbdotconf/misc/rootpostexec.xml | 1 -
docs-xml/smbdotconf/misc/rootpreexec.xml | 1 -
docs-xml/smbdotconf/misc/rootpreexecclose.xml | 1 -
docs-xml/smbdotconf/misc/rpcdaemon.xml | 1 -
docs-xml/smbdotconf/misc/rpcserver.xml | 1 -
docs-xml/smbdotconf/misc/statedirectory.xml | 1 -
docs-xml/smbdotconf/misc/usershareallowguests.xml | 1 -
docs-xml/smbdotconf/misc/usersharemaxshares.xml | 1 -
docs-xml/smbdotconf/misc/usershareowneronly.xml | 1 -
docs-xml/smbdotconf/misc/usersharepath.xml | 1 -
docs-xml/smbdotconf/misc/usershareprefixallowlist.xml | 1 -
docs-xml/smbdotconf/misc/usershareprefixdenylist.xml | 1 -
docs-xml/smbdotconf/misc/usersharetemplateshare.xml | 1 -
docs-xml/smbdotconf/misc/utmp.xml | 1 -
docs-xml/smbdotconf/misc/utmpdirectory.xml | 1 -
docs-xml/smbdotconf/misc/wtmpdirectory.xml | 1 -
61 files changed, 1 insertion(+), 61 deletions(-)
diff --git a/docs-xml/smbdotconf/misc/addsharecommand.xml b/docs-xml/smbdotconf/misc/addsharecommand.xml
index de8da7b..3beb8de 100644
--- a/docs-xml/smbdotconf/misc/addsharecommand.xml
+++ b/docs-xml/smbdotconf/misc/addsharecommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="add share command"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/afsshare.xml b/docs-xml/smbdotconf/misc/afsshare.xml
index 67d42d4..d2c3d1e 100644
--- a/docs-xml/smbdotconf/misc/afsshare.xml
+++ b/docs-xml/smbdotconf/misc/afsshare.xml
@@ -1,7 +1,6 @@
<samba:parameter name="afs share"
context="S"
type="boolean"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter controls whether special AFS features are enabled
diff --git a/docs-xml/smbdotconf/misc/afstokenlifetime.xml b/docs-xml/smbdotconf/misc/afstokenlifetime.xml
index cbf9574..9d6e13a 100644
--- a/docs-xml/smbdotconf/misc/afstokenlifetime.xml
+++ b/docs-xml/smbdotconf/misc/afstokenlifetime.xml
@@ -1,7 +1,6 @@
<samba:parameter name="afs token lifetime"
context="G"
type="integer"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter controls the lifetime of tokens that the AFS
diff --git a/docs-xml/smbdotconf/misc/afsusernamemap.xml b/docs-xml/smbdotconf/misc/afsusernamemap.xml
index 992b1ac..94f0cee 100644
--- a/docs-xml/smbdotconf/misc/afsusernamemap.xml
+++ b/docs-xml/smbdotconf/misc/afsusernamemap.xml
@@ -1,7 +1,6 @@
<samba:parameter name="afs username map"
context="G"
type="string"
- advanced="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/asyncsmbechohandler.xml b/docs-xml/smbdotconf/misc/asyncsmbechohandler.xml
index d10dac9..84e2f1a 100644
--- a/docs-xml/smbdotconf/misc/asyncsmbechohandler.xml
+++ b/docs-xml/smbdotconf/misc/asyncsmbechohandler.xml
@@ -1,7 +1,6 @@
<samba:parameter name="async smb echo handler"
context="G"
type="boolean"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies whether Samba should fork the
diff --git a/docs-xml/smbdotconf/misc/available.xml b/docs-xml/smbdotconf/misc/available.xml
index eac0dc5..343c6fd 100644
--- a/docs-xml/smbdotconf/misc/available.xml
+++ b/docs-xml/smbdotconf/misc/available.xml
@@ -1,6 +1,5 @@
<samba:parameter name="available"
context="S"
- basic="1" advanced="1" print="1"
type="boolean"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/misc/cachedirectory.xml b/docs-xml/smbdotconf/misc/cachedirectory.xml
index e72d852..b0731f9 100644
--- a/docs-xml/smbdotconf/misc/cachedirectory.xml
+++ b/docs-xml/smbdotconf/misc/cachedirectory.xml
@@ -1,6 +1,5 @@
<samba:parameter name="cache directory"
context="G"
- advanced="1" developer="1"
type="string"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/misc/changenotify.xml b/docs-xml/smbdotconf/misc/changenotify.xml
index 3a2debb..1344dce 100644
--- a/docs-xml/smbdotconf/misc/changenotify.xml
+++ b/docs-xml/smbdotconf/misc/changenotify.xml
@@ -1,7 +1,6 @@
<samba:parameter name="change notify"
context="S"
type="boolean"
- advanced="1"
parm="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/changesharecommand.xml b/docs-xml/smbdotconf/misc/changesharecommand.xml
index 909a10c..fbfc440 100644
--- a/docs-xml/smbdotconf/misc/changesharecommand.xml
+++ b/docs-xml/smbdotconf/misc/changesharecommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="change share command"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/clusteraddresses.xml b/docs-xml/smbdotconf/misc/clusteraddresses.xml
index d34d550..b489ed4 100644
--- a/docs-xml/smbdotconf/misc/clusteraddresses.xml
+++ b/docs-xml/smbdotconf/misc/clusteraddresses.xml
@@ -1,7 +1,6 @@
<samba:parameter name="cluster addresses"
context="G"
type="list"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>With this parameter you can add additional addresses
diff --git a/docs-xml/smbdotconf/misc/clustering.xml b/docs-xml/smbdotconf/misc/clustering.xml
index b85934e..3613670 100644
--- a/docs-xml/smbdotconf/misc/clustering.xml
+++ b/docs-xml/smbdotconf/misc/clustering.xml
@@ -1,7 +1,6 @@
<samba:parameter name="clustering"
context="G"
type="boolean"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies whether Samba should contact
diff --git a/docs-xml/smbdotconf/misc/configfile.xml b/docs-xml/smbdotconf/misc/configfile.xml
index abbc80c..450be18 100644
--- a/docs-xml/smbdotconf/misc/configfile.xml
+++ b/docs-xml/smbdotconf/misc/configfile.xml
@@ -1,7 +1,6 @@
<samba:parameter name="config file"
context="G"
type="string"
- hide="1"
function="next_configfile"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/copy.xml b/docs-xml/smbdotconf/misc/copy.xml
index 6399e93..945f2c9 100644
--- a/docs-xml/smbdotconf/misc/copy.xml
+++ b/docs-xml/smbdotconf/misc/copy.xml
@@ -1,6 +1,6 @@
<samba:parameter name="copy"
type="string"
- context="S" hide="1"
+ context="S"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/ctdbdsocket.xml b/docs-xml/smbdotconf/misc/ctdbdsocket.xml
index 27e8121..f852f59 100644
--- a/docs-xml/smbdotconf/misc/ctdbdsocket.xml
+++ b/docs-xml/smbdotconf/misc/ctdbdsocket.xml
@@ -1,6 +1,5 @@
<samba:parameter name="ctdbd socket"
context="G"
- advanced="1"
type="string"
constant="1"
function="_ctdbd_socket"
diff --git a/docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml b/docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml
index a3289a9..283de6b 100644
--- a/docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml
+++ b/docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ctdb locktime warn threshold"
context="G"
type="integer"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/ctdbtimeout.xml b/docs-xml/smbdotconf/misc/ctdbtimeout.xml
index 1cc6262..90780d6 100644
--- a/docs-xml/smbdotconf/misc/ctdbtimeout.xml
+++ b/docs-xml/smbdotconf/misc/ctdbtimeout.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ctdb timeout"
context="G"
type="integer"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies a timeout in seconds for the
diff --git a/docs-xml/smbdotconf/misc/defaultservice.xml b/docs-xml/smbdotconf/misc/defaultservice.xml
index 0150163..c0942f5 100644
--- a/docs-xml/smbdotconf/misc/defaultservice.xml
+++ b/docs-xml/smbdotconf/misc/defaultservice.xml
@@ -1,6 +1,5 @@
<samba:parameter name="default service"
context="G"
- advanced="1" developer="1"
type="string"
function="defaultservice"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/misc/deletesharecommand.xml b/docs-xml/smbdotconf/misc/deletesharecommand.xml
index 3def6b8..4e20523 100644
--- a/docs-xml/smbdotconf/misc/deletesharecommand.xml
+++ b/docs-xml/smbdotconf/misc/deletesharecommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="delete share command"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/dfreecachetime.xml b/docs-xml/smbdotconf/misc/dfreecachetime.xml
index 62d3557..b21535e 100644
--- a/docs-xml/smbdotconf/misc/dfreecachetime.xml
+++ b/docs-xml/smbdotconf/misc/dfreecachetime.xml
@@ -1,7 +1,6 @@
<samba:parameter name="dfree cache time"
context="S"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/dfreecommand.xml b/docs-xml/smbdotconf/misc/dfreecommand.xml
index de60c5e..a678bb4 100644
--- a/docs-xml/smbdotconf/misc/dfreecommand.xml
+++ b/docs-xml/smbdotconf/misc/dfreecommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="dfree command"
context="S"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/directorynamecachesize.xml b/docs-xml/smbdotconf/misc/directorynamecachesize.xml
index d02c4f5..e9f974b 100644
--- a/docs-xml/smbdotconf/misc/directorynamecachesize.xml
+++ b/docs-xml/smbdotconf/misc/directorynamecachesize.xml
@@ -1,7 +1,6 @@
<samba:parameter name="directory name cache size"
context="S"
type="integer"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/dmapisupport.xml b/docs-xml/smbdotconf/misc/dmapisupport.xml
index fbd145d..6ff85dd 100644
--- a/docs-xml/smbdotconf/misc/dmapisupport.xml
+++ b/docs-xml/smbdotconf/misc/dmapisupport.xml
@@ -1,7 +1,6 @@
<samba:parameter name="dmapi support"
context="S"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies whether Samba should use DMAPI to
diff --git a/docs-xml/smbdotconf/misc/fssprunestale.xml b/docs-xml/smbdotconf/misc/fssprunestale.xml
index d583104..a8287b0 100644
--- a/docs-xml/smbdotconf/misc/fssprunestale.xml
+++ b/docs-xml/smbdotconf/misc/fssprunestale.xml
@@ -1,7 +1,6 @@
<samba:parameter name="fss: prune stale"
context="G"
type="boolean"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/fsssequencetimeout.xml b/docs-xml/smbdotconf/misc/fsssequencetimeout.xml
index 9419a33..300ff6c 100644
--- a/docs-xml/smbdotconf/misc/fsssequencetimeout.xml
+++ b/docs-xml/smbdotconf/misc/fsssequencetimeout.xml
@@ -1,7 +1,6 @@
<samba:parameter name="fss: sequence timeout"
context="G"
type="integer"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/homedirmap.xml b/docs-xml/smbdotconf/misc/homedirmap.xml
index 37b46ee..e50f64f 100644
--- a/docs-xml/smbdotconf/misc/homedirmap.xml
+++ b/docs-xml/smbdotconf/misc/homedirmap.xml
@@ -1,7 +1,6 @@
<samba:parameter name="homedir map"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/include.xml b/docs-xml/smbdotconf/misc/include.xml
index 67a84f2..bfd7b3f 100644
--- a/docs-xml/smbdotconf/misc/include.xml
+++ b/docs-xml/smbdotconf/misc/include.xml
@@ -1,7 +1,6 @@
<samba:parameter name="include"
context="G"
type="string"
- hide="1"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/kernelchangenotify.xml b/docs-xml/smbdotconf/misc/kernelchangenotify.xml
index e90f845..1e11bb8 100644
--- a/docs-xml/smbdotconf/misc/kernelchangenotify.xml
+++ b/docs-xml/smbdotconf/misc/kernelchangenotify.xml
@@ -1,7 +1,6 @@
<samba:parameter name="kernel change notify"
context="S"
type="boolean"
- advanced="1"
parm="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/lockdirectory.xml b/docs-xml/smbdotconf/misc/lockdirectory.xml
index 7c4f536..7a9cdf8 100644
--- a/docs-xml/smbdotconf/misc/lockdirectory.xml
+++ b/docs-xml/smbdotconf/misc/lockdirectory.xml
@@ -1,6 +1,5 @@
<samba:parameter name="lock directory"
context="G"
- advanced="1" developer="1"
type="string"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml b/docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml
index 9d2b750..320abfc 100644
--- a/docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml
+++ b/docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml
@@ -1,7 +1,6 @@
<samba:parameter name="log writeable files on exit"
context="G"
type="boolean"
- advanced="1" developer="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/messagecommand.xml b/docs-xml/smbdotconf/misc/messagecommand.xml
index 91df58a..ee0db13 100644
--- a/docs-xml/smbdotconf/misc/messagecommand.xml
+++ b/docs-xml/smbdotconf/misc/messagecommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="message command"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This specifies what command to run when the
diff --git a/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml b/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
index c95a180..4651c19 100644
--- a/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
+++ b/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
@@ -1,7 +1,6 @@
<samba:parameter name="nbt client socket address"
context="G"
type="string"
- developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>socket address</synonym>
diff --git a/docs-xml/smbdotconf/misc/ncalrpcdir.xml b/docs-xml/smbdotconf/misc/ncalrpcdir.xml
index 2e29514..1d84d60 100644
--- a/docs-xml/smbdotconf/misc/ncalrpcdir.xml
+++ b/docs-xml/smbdotconf/misc/ncalrpcdir.xml
@@ -1,6 +1,5 @@
<samba:parameter name="ncalrpc dir"
context="G"
- advanced="1" developer="1"
type="string"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/misc/nishomedir.xml b/docs-xml/smbdotconf/misc/nishomedir.xml
index c617563..4e66e71 100644
--- a/docs-xml/smbdotconf/misc/nishomedir.xml
+++ b/docs-xml/smbdotconf/misc/nishomedir.xml
@@ -1,7 +1,6 @@
<samba:parameter name="NIS homedir"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Get the home share server from a NIS map. For
diff --git a/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml b/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
index 3a44a69..91f69a4 100644
--- a/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
+++ b/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
@@ -1,6 +1,5 @@
<samba:parameter name="nmbd bind explicit broadcast"
context="G"
- advanced="1" developer="1"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/panicaction.xml b/docs-xml/smbdotconf/misc/panicaction.xml
index b8ffa70..ce4c15f 100644
--- a/docs-xml/smbdotconf/misc/panicaction.xml
+++ b/docs-xml/smbdotconf/misc/panicaction.xml
@@ -1,7 +1,6 @@
<samba:parameter name="panic action"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This is a Samba developer option that allows a
diff --git a/docs-xml/smbdotconf/misc/perfcountmodule.xml b/docs-xml/smbdotconf/misc/perfcountmodule.xml
index f22c399..50da2c67 100644
--- a/docs-xml/smbdotconf/misc/perfcountmodule.xml
+++ b/docs-xml/smbdotconf/misc/perfcountmodule.xml
@@ -1,7 +1,6 @@
<samba:parameter name="perfcount module"
context="G"
type="string"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies the perfcount backend to be used when monitoring SMB
diff --git a/docs-xml/smbdotconf/misc/piddirectory.xml b/docs-xml/smbdotconf/misc/piddirectory.xml
index 8362df2..56206cb 100644
--- a/docs-xml/smbdotconf/misc/piddirectory.xml
+++ b/docs-xml/smbdotconf/misc/piddirectory.xml
@@ -1,7 +1,6 @@
<samba:parameter name="pid directory"
context="G"
type="string"
- advanced="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/postexec.xml b/docs-xml/smbdotconf/misc/postexec.xml
index 3f0cb50..db6d88f 100644
--- a/docs-xml/smbdotconf/misc/postexec.xml
+++ b/docs-xml/smbdotconf/misc/postexec.xml
@@ -1,7 +1,6 @@
<samba:parameter name="postexec"
context="S"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option specifies a command to be run
diff --git a/docs-xml/smbdotconf/misc/preexec.xml b/docs-xml/smbdotconf/misc/preexec.xml
index 6608c83..bbcee49 100644
--- a/docs-xml/smbdotconf/misc/preexec.xml
+++ b/docs-xml/smbdotconf/misc/preexec.xml
@@ -1,7 +1,6 @@
<samba:parameter name="preexec"
context="S"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>exec</synonym>
<description>
diff --git a/docs-xml/smbdotconf/misc/preexecclose.xml b/docs-xml/smbdotconf/misc/preexecclose.xml
index 7a477e1..3d184e1 100644
--- a/docs-xml/smbdotconf/misc/preexecclose.xml
+++ b/docs-xml/smbdotconf/misc/preexecclose.xml
@@ -1,7 +1,6 @@
<samba:parameter name="preexec close"
context="S"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/preload.xml b/docs-xml/smbdotconf/misc/preload.xml
index 54f5999..70d7ca6 100644
--- a/docs-xml/smbdotconf/misc/preload.xml
+++ b/docs-xml/smbdotconf/misc/preload.xml
@@ -1,6 +1,5 @@
<samba:parameter name="preload"
context="G"
- advanced="1" developer="1"
type="string"
function="auto_services"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/misc/registryshares.xml b/docs-xml/smbdotconf/misc/registryshares.xml
index 0c2eddc..bb25005 100644
--- a/docs-xml/smbdotconf/misc/registryshares.xml
+++ b/docs-xml/smbdotconf/misc/registryshares.xml
@@ -1,7 +1,6 @@
<samba:parameter name="registry shares"
context="G"
type="boolean"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/remoteannounce.xml b/docs-xml/smbdotconf/misc/remoteannounce.xml
index fa6c04f..5d442ea 100644
--- a/docs-xml/smbdotconf/misc/remoteannounce.xml
+++ b/docs-xml/smbdotconf/misc/remoteannounce.xml
@@ -1,6 +1,5 @@
<samba:parameter name="remote announce"
context="G"
- advanced="1" developer="1"
type="string"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/remotebrowsesync.xml b/docs-xml/smbdotconf/misc/remotebrowsesync.xml
index d6e66f1..2c7547d 100644
--- a/docs-xml/smbdotconf/misc/remotebrowsesync.xml
+++ b/docs-xml/smbdotconf/misc/remotebrowsesync.xml
@@ -1,6 +1,5 @@
<samba:parameter name="remote browse sync"
context="G"
- advanced="1" developer="1"
type="string"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/resetonzerovc.xml b/docs-xml/smbdotconf/misc/resetonzerovc.xml
index 3276cf5..1fa3023 100644
--- a/docs-xml/smbdotconf/misc/resetonzerovc.xml
+++ b/docs-xml/smbdotconf/misc/resetonzerovc.xml
@@ -1,7 +1,6 @@
<samba:parameter name="reset on zero vc"
context="G"
type="boolean"
- advanced="1" developer="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/rootpostexec.xml b/docs-xml/smbdotconf/misc/rootpostexec.xml
index 4aff4f0..5a9613c 100644
--- a/docs-xml/smbdotconf/misc/rootpostexec.xml
+++ b/docs-xml/smbdotconf/misc/rootpostexec.xml
@@ -1,7 +1,6 @@
<samba:parameter name="root postexec"
context="S"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/rootpreexec.xml b/docs-xml/smbdotconf/misc/rootpreexec.xml
index 89d10ec..f0fff73 100644
--- a/docs-xml/smbdotconf/misc/rootpreexec.xml
+++ b/docs-xml/smbdotconf/misc/rootpreexec.xml
@@ -1,7 +1,6 @@
<samba:parameter name="root preexec"
context="S"
type="string"
- advanced="1" wizard="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/rootpreexecclose.xml b/docs-xml/smbdotconf/misc/rootpreexecclose.xml
index e0f11b5..3bce915 100644
--- a/docs-xml/smbdotconf/misc/rootpreexecclose.xml
+++ b/docs-xml/smbdotconf/misc/rootpreexecclose.xml
@@ -1,7 +1,6 @@
<samba:parameter name="root preexec close"
context="S"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This is the same as the <parameter moreinfo="none">preexec close
diff --git a/docs-xml/smbdotconf/misc/rpcdaemon.xml b/docs-xml/smbdotconf/misc/rpcdaemon.xml
index a06e91d..e9654a0 100644
--- a/docs-xml/smbdotconf/misc/rpcdaemon.xml
+++ b/docs-xml/smbdotconf/misc/rpcdaemon.xml
@@ -1,7 +1,6 @@
<samba:parameter name="rpc_daemon:DAEMON"
context="G"
type="string"
- advanced="1" print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/rpcserver.xml b/docs-xml/smbdotconf/misc/rpcserver.xml
index 9a22939..d285872 100644
--- a/docs-xml/smbdotconf/misc/rpcserver.xml
+++ b/docs-xml/smbdotconf/misc/rpcserver.xml
@@ -1,7 +1,6 @@
<samba:parameter name="rpc_server:SERVER"
context="G"
type="string"
- advanced="1" print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/statedirectory.xml b/docs-xml/smbdotconf/misc/statedirectory.xml
index 1079868..71200ea 100644
--- a/docs-xml/smbdotconf/misc/statedirectory.xml
+++ b/docs-xml/smbdotconf/misc/statedirectory.xml
@@ -1,6 +1,5 @@
<samba:parameter name="state directory"
context="G"
- advanced="1" developer="1"
type="string"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/misc/usershareallowguests.xml b/docs-xml/smbdotconf/misc/usershareallowguests.xml
index a3ae518..6fd75d1 100644
--- a/docs-xml/smbdotconf/misc/usershareallowguests.xml
+++ b/docs-xml/smbdotconf/misc/usershareallowguests.xml
@@ -1,6 +1,5 @@
<samba:parameter name="usershare allow guests"
context="G"
- basic="1" advanced="1"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/usersharemaxshares.xml b/docs-xml/smbdotconf/misc/usersharemaxshares.xml
index ed76283..1d2bab7 100644
--- a/docs-xml/smbdotconf/misc/usersharemaxshares.xml
+++ b/docs-xml/smbdotconf/misc/usersharemaxshares.xml
@@ -1,6 +1,5 @@
<samba:parameter name="usershare max shares"
context="G"
- basic="1" advanced="1"
type="integer"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/usershareowneronly.xml b/docs-xml/smbdotconf/misc/usershareowneronly.xml
index 74e64aa..acfb1df 100644
--- a/docs-xml/smbdotconf/misc/usershareowneronly.xml
+++ b/docs-xml/smbdotconf/misc/usershareowneronly.xml
@@ -1,6 +1,5 @@
<samba:parameter name="usershare owner only"
context="G"
- basic="1" advanced="1"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/usersharepath.xml b/docs-xml/smbdotconf/misc/usersharepath.xml
index a095f17..a1b2841 100644
--- a/docs-xml/smbdotconf/misc/usersharepath.xml
+++ b/docs-xml/smbdotconf/misc/usersharepath.xml
@@ -1,6 +1,5 @@
<samba:parameter name="usershare path"
context="G"
- basic="1" advanced="1"
type="string"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml b/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
index 9fcba9d..481431e 100644
--- a/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
+++ b/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
@@ -1,6 +1,5 @@
<samba:parameter name="usershare prefix allow list"
context="G"
- basic="1" advanced="1"
type="list"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/usershareprefixdenylist.xml b/docs-xml/smbdotconf/misc/usershareprefixdenylist.xml
index bd34f79..396e8c1 100644
--- a/docs-xml/smbdotconf/misc/usershareprefixdenylist.xml
+++ b/docs-xml/smbdotconf/misc/usershareprefixdenylist.xml
@@ -1,6 +1,5 @@
<samba:parameter name="usershare prefix deny list"
context="G"
- basic="1" advanced="1"
type="list"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/usersharetemplateshare.xml b/docs-xml/smbdotconf/misc/usersharetemplateshare.xml
index fd8d573..dd50f43 100644
--- a/docs-xml/smbdotconf/misc/usersharetemplateshare.xml
+++ b/docs-xml/smbdotconf/misc/usersharetemplateshare.xml
@@ -1,6 +1,5 @@
<samba:parameter name="usershare template share"
context="G"
- basic="1" advanced="1"
type="string"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/utmp.xml b/docs-xml/smbdotconf/misc/utmp.xml
index 67c02cc..6382d46 100644
--- a/docs-xml/smbdotconf/misc/utmp.xml
+++ b/docs-xml/smbdotconf/misc/utmp.xml
@@ -1,7 +1,6 @@
<samba:parameter name="utmp"
context="G"
type="boolean"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/utmpdirectory.xml b/docs-xml/smbdotconf/misc/utmpdirectory.xml
index 9eb5010..b962ff3 100644
--- a/docs-xml/smbdotconf/misc/utmpdirectory.xml
+++ b/docs-xml/smbdotconf/misc/utmpdirectory.xml
@@ -1,7 +1,6 @@
<samba:parameter name="utmp directory"
context="G"
type="string"
- advanced="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/misc/wtmpdirectory.xml b/docs-xml/smbdotconf/misc/wtmpdirectory.xml
index c6c6ecc..4652153 100644
--- a/docs-xml/smbdotconf/misc/wtmpdirectory.xml
+++ b/docs-xml/smbdotconf/misc/wtmpdirectory.xml
@@ -1,7 +1,6 @@
<samba:parameter name="wtmp directory"
context="G"
type="string"
- advanced="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
--
2.1.0
From d718fdb931cdec1d32a1ca7a26a792d159aff43d Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 28 Apr 2015 23:44:21 +0200
Subject: [PATCH 15/22] docs:smbdotconf: remove swat-specific flags from
printing/
Signed-off-by: Michael Adam <obnox at samba.org>
---
docs-xml/smbdotconf/printing/addportcommand.xml | 1 -
docs-xml/smbdotconf/printing/addprintercommand.xml | 1 -
docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml | 1 -
docs-xml/smbdotconf/printing/cupsencrypt.xml | 1 -
docs-xml/smbdotconf/printing/cupsoptions.xml | 1 -
docs-xml/smbdotconf/printing/cupsserver.xml | 1 -
docs-xml/smbdotconf/printing/defaultdevmode.xml | 1 -
docs-xml/smbdotconf/printing/deleteprintercommand.xml | 1 -
docs-xml/smbdotconf/printing/disablespoolss.xml | 1 -
docs-xml/smbdotconf/printing/enumportscommand.xml | 1 -
docs-xml/smbdotconf/printing/forceprintername.xml | 1 -
docs-xml/smbdotconf/printing/iprintserver.xml | 1 -
docs-xml/smbdotconf/printing/loadprinters.xml | 1 -
docs-xml/smbdotconf/printing/lppausecommand.xml | 1 -
docs-xml/smbdotconf/printing/lpqcachetime.xml | 1 -
docs-xml/smbdotconf/printing/lpqcommand.xml | 1 -
docs-xml/smbdotconf/printing/lpresumecommand.xml | 1 -
docs-xml/smbdotconf/printing/lprmcommand.xml | 1 -
docs-xml/smbdotconf/printing/maxprintjobs.xml | 1 -
docs-xml/smbdotconf/printing/maxreportedprintjobs.xml | 1 -
docs-xml/smbdotconf/printing/os2drivermap.xml | 1 -
docs-xml/smbdotconf/printing/printable.xml | 1 -
docs-xml/smbdotconf/printing/printcapcachetime.xml | 1 -
docs-xml/smbdotconf/printing/printcapname.xml | 1 -
docs-xml/smbdotconf/printing/printcommand.xml | 1 -
docs-xml/smbdotconf/printing/printername.xml | 1 -
docs-xml/smbdotconf/printing/printing.xml | 1 -
docs-xml/smbdotconf/printing/printjobusername.xml | 1 -
docs-xml/smbdotconf/printing/printnotifybackchannel.xml | 1 -
docs-xml/smbdotconf/printing/queuepausecommand.xml | 1 -
docs-xml/smbdotconf/printing/queueresumecommand.xml | 1 -
docs-xml/smbdotconf/printing/showaddprinterwizard.xml | 1 -
docs-xml/smbdotconf/printing/spoolssarchitecture.xml | 2 --
docs-xml/smbdotconf/printing/spoolssosversion.xml | 6 ------
docs-xml/smbdotconf/printing/useclientdriver.xml | 1 -
35 files changed, 41 deletions(-)
diff --git a/docs-xml/smbdotconf/printing/addportcommand.xml b/docs-xml/smbdotconf/printing/addportcommand.xml
index 80e56c9..8a44a97 100644
--- a/docs-xml/smbdotconf/printing/addportcommand.xml
+++ b/docs-xml/smbdotconf/printing/addportcommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="addport command"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Samba 3.0.23 introduced support for adding printer ports
diff --git a/docs-xml/smbdotconf/printing/addprintercommand.xml b/docs-xml/smbdotconf/printing/addprintercommand.xml
index c66f43e..36d0f85 100644
--- a/docs-xml/smbdotconf/printing/addprintercommand.xml
+++ b/docs-xml/smbdotconf/printing/addprintercommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="addprinter command"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>With the introduction of MS-RPC based printing
diff --git a/docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml b/docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml
index 1c7df15..bcb6985 100644
--- a/docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml
+++ b/docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml
@@ -1,7 +1,6 @@
<samba:parameter name="cups connection timeout"
context="G"
type="integer"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/printing/cupsencrypt.xml b/docs-xml/smbdotconf/printing/cupsencrypt.xml
index 27392ea..cba55d2 100644
--- a/docs-xml/smbdotconf/printing/cupsencrypt.xml
+++ b/docs-xml/smbdotconf/printing/cupsencrypt.xml
@@ -1,7 +1,6 @@
<samba:parameter name="cups encrypt"
context="G"
type="enum"
- advanced="1" print="1"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/printing/cupsoptions.xml b/docs-xml/smbdotconf/printing/cupsoptions.xml
index 616e273..6079b19 100644
--- a/docs-xml/smbdotconf/printing/cupsoptions.xml
+++ b/docs-xml/smbdotconf/printing/cupsoptions.xml
@@ -1,7 +1,6 @@
<samba:parameter name="cups options"
context="S"
type="string"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/printing/cupsserver.xml b/docs-xml/smbdotconf/printing/cupsserver.xml
index b31db33..a301985 100644
--- a/docs-xml/smbdotconf/printing/cupsserver.xml
+++ b/docs-xml/smbdotconf/printing/cupsserver.xml
@@ -1,7 +1,6 @@
<samba:parameter name="cups server"
context="G"
type="string"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/printing/defaultdevmode.xml b/docs-xml/smbdotconf/printing/defaultdevmode.xml
index 218ddcb..c2c7d3e 100644
--- a/docs-xml/smbdotconf/printing/defaultdevmode.xml
+++ b/docs-xml/smbdotconf/printing/defaultdevmode.xml
@@ -1,7 +1,6 @@
<samba:parameter name="default devmode"
context="S"
type="boolean"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter is only applicable to <smbconfoption name="printable"/> services.
diff --git a/docs-xml/smbdotconf/printing/deleteprintercommand.xml b/docs-xml/smbdotconf/printing/deleteprintercommand.xml
index 597387c..f26fc00 100644
--- a/docs-xml/smbdotconf/printing/deleteprintercommand.xml
+++ b/docs-xml/smbdotconf/printing/deleteprintercommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="deleteprinter command"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>With the introduction of MS-RPC based printer
diff --git a/docs-xml/smbdotconf/printing/disablespoolss.xml b/docs-xml/smbdotconf/printing/disablespoolss.xml
index 883e1a8..63c2e19 100644
--- a/docs-xml/smbdotconf/printing/disablespoolss.xml
+++ b/docs-xml/smbdotconf/printing/disablespoolss.xml
@@ -1,7 +1,6 @@
<samba:parameter name="disable spoolss"
context="G"
type="boolean"
- print="1"
function="_disable_spoolss"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/printing/enumportscommand.xml b/docs-xml/smbdotconf/printing/enumportscommand.xml
index 41db739..17880c6 100644
--- a/docs-xml/smbdotconf/printing/enumportscommand.xml
+++ b/docs-xml/smbdotconf/printing/enumportscommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="enumports command"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>The concept of a "port" is fairly foreign
diff --git a/docs-xml/smbdotconf/printing/forceprintername.xml b/docs-xml/smbdotconf/printing/forceprintername.xml
index 453feed..7503494 100644
--- a/docs-xml/smbdotconf/printing/forceprintername.xml
+++ b/docs-xml/smbdotconf/printing/forceprintername.xml
@@ -1,7 +1,6 @@
<samba:parameter name="force printername"
context="S"
type="boolean"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>When printing from Windows NT (or later),
diff --git a/docs-xml/smbdotconf/printing/iprintserver.xml b/docs-xml/smbdotconf/printing/iprintserver.xml
index 81c7ca5..55a0594 100644
--- a/docs-xml/smbdotconf/printing/iprintserver.xml
+++ b/docs-xml/smbdotconf/printing/iprintserver.xml
@@ -1,7 +1,6 @@
<samba:parameter name="iprint server"
context="G"
type="string"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/printing/loadprinters.xml b/docs-xml/smbdotconf/printing/loadprinters.xml
index 7e40ebe..2072745 100644
--- a/docs-xml/smbdotconf/printing/loadprinters.xml
+++ b/docs-xml/smbdotconf/printing/loadprinters.xml
@@ -1,7 +1,6 @@
<samba:parameter name="load printers"
context="G"
type="boolean"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>A boolean variable that controls whether all
diff --git a/docs-xml/smbdotconf/printing/lppausecommand.xml b/docs-xml/smbdotconf/printing/lppausecommand.xml
index a165375..0ca8f4d 100644
--- a/docs-xml/smbdotconf/printing/lppausecommand.xml
+++ b/docs-xml/smbdotconf/printing/lppausecommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="lppause command"
context="S"
type="string"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies the command to be
diff --git a/docs-xml/smbdotconf/printing/lpqcachetime.xml b/docs-xml/smbdotconf/printing/lpqcachetime.xml
index 5a64937..dcced48 100644
--- a/docs-xml/smbdotconf/printing/lpqcachetime.xml
+++ b/docs-xml/smbdotconf/printing/lpqcachetime.xml
@@ -1,7 +1,6 @@
<samba:parameter name="lpq cache time"
context="G"
type="integer"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This controls how long lpq info will be cached
diff --git a/docs-xml/smbdotconf/printing/lpqcommand.xml b/docs-xml/smbdotconf/printing/lpqcommand.xml
index 1e02139..ee2c3d0 100644
--- a/docs-xml/smbdotconf/printing/lpqcommand.xml
+++ b/docs-xml/smbdotconf/printing/lpqcommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="lpq command"
context="S"
type="string"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies the command to be
diff --git a/docs-xml/smbdotconf/printing/lpresumecommand.xml b/docs-xml/smbdotconf/printing/lpresumecommand.xml
index ef7639c..e769fe3 100644
--- a/docs-xml/smbdotconf/printing/lpresumecommand.xml
+++ b/docs-xml/smbdotconf/printing/lpresumecommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="lpresume command"
context="S"
type="string"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies the command to be
diff --git a/docs-xml/smbdotconf/printing/lprmcommand.xml b/docs-xml/smbdotconf/printing/lprmcommand.xml
index 7ce9964..d542868 100644
--- a/docs-xml/smbdotconf/printing/lprmcommand.xml
+++ b/docs-xml/smbdotconf/printing/lprmcommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="lprm command"
context="S"
type="string"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies the command to be
diff --git a/docs-xml/smbdotconf/printing/maxprintjobs.xml b/docs-xml/smbdotconf/printing/maxprintjobs.xml
index 659e173..0b3db05 100644
--- a/docs-xml/smbdotconf/printing/maxprintjobs.xml
+++ b/docs-xml/smbdotconf/printing/maxprintjobs.xml
@@ -1,6 +1,5 @@
<samba:parameter name="max print jobs"
context="S"
- print="1"
type="integer"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/printing/maxreportedprintjobs.xml b/docs-xml/smbdotconf/printing/maxreportedprintjobs.xml
index 34a5eb7..e5e9570 100644
--- a/docs-xml/smbdotconf/printing/maxreportedprintjobs.xml
+++ b/docs-xml/smbdotconf/printing/maxreportedprintjobs.xml
@@ -1,7 +1,6 @@
<samba:parameter name="max reported print jobs"
context="S"
type="integer"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/printing/os2drivermap.xml b/docs-xml/smbdotconf/printing/os2drivermap.xml
index a578d3a..c06002c 100644
--- a/docs-xml/smbdotconf/printing/os2drivermap.xml
+++ b/docs-xml/smbdotconf/printing/os2drivermap.xml
@@ -1,6 +1,5 @@
<samba:parameter name="os2 driver map"
context="G"
- advanced="1" developer="1"
type="string"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/printing/printable.xml b/docs-xml/smbdotconf/printing/printable.xml
index 73aa533..ab8b5de 100644
--- a/docs-xml/smbdotconf/printing/printable.xml
+++ b/docs-xml/smbdotconf/printing/printable.xml
@@ -1,6 +1,5 @@
<samba:parameter name="printable"
context="S"
- print="1"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>print ok</synonym>
diff --git a/docs-xml/smbdotconf/printing/printcapcachetime.xml b/docs-xml/smbdotconf/printing/printcapcachetime.xml
index e9e0c98..4bbcb2d 100644
--- a/docs-xml/smbdotconf/printing/printcapcachetime.xml
+++ b/docs-xml/smbdotconf/printing/printcapcachetime.xml
@@ -1,7 +1,6 @@
<samba:parameter name="printcap cache time"
context="G"
type="integer"
- print="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option specifies the number of seconds before the printing
diff --git a/docs-xml/smbdotconf/printing/printcapname.xml b/docs-xml/smbdotconf/printing/printcapname.xml
index 1b9c852..edb47d7 100644
--- a/docs-xml/smbdotconf/printing/printcapname.xml
+++ b/docs-xml/smbdotconf/printing/printcapname.xml
@@ -1,7 +1,6 @@
<samba:parameter name="printcap name"
context="G"
type="string"
- print="1" developer="1"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>printcap</synonym>
diff --git a/docs-xml/smbdotconf/printing/printcommand.xml b/docs-xml/smbdotconf/printing/printcommand.xml
index 461d6de..18881e9 100644
--- a/docs-xml/smbdotconf/printing/printcommand.xml
+++ b/docs-xml/smbdotconf/printing/printcommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="print command"
context="S"
type="string"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>After a print job has finished spooling to
diff --git a/docs-xml/smbdotconf/printing/printername.xml b/docs-xml/smbdotconf/printing/printername.xml
index 0e3a11a..1d3f79e 100644
--- a/docs-xml/smbdotconf/printing/printername.xml
+++ b/docs-xml/smbdotconf/printing/printername.xml
@@ -1,6 +1,5 @@
<samba:parameter name="printer name"
context="S"
- print="1"
type="string"
function="_printername"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/printing/printing.xml b/docs-xml/smbdotconf/printing/printing.xml
index a1a2178..14ec2b0 100644
--- a/docs-xml/smbdotconf/printing/printing.xml
+++ b/docs-xml/smbdotconf/printing/printing.xml
@@ -1,7 +1,6 @@
<samba:parameter name="printing"
context="S"
type="enum"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameters controls how printer status information is
diff --git a/docs-xml/smbdotconf/printing/printjobusername.xml b/docs-xml/smbdotconf/printing/printjobusername.xml
index 782336e..71d143c 100644
--- a/docs-xml/smbdotconf/printing/printjobusername.xml
+++ b/docs-xml/smbdotconf/printing/printjobusername.xml
@@ -1,7 +1,6 @@
<samba:parameter name="printjob username"
context="S"
type="string"
- print="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/printing/printnotifybackchannel.xml b/docs-xml/smbdotconf/printing/printnotifybackchannel.xml
index ce6a595f..b9d32ec 100644
--- a/docs-xml/smbdotconf/printing/printnotifybackchannel.xml
+++ b/docs-xml/smbdotconf/printing/printnotifybackchannel.xml
@@ -1,6 +1,5 @@
<samba:parameter name="print notify backchannel"
context="S"
- print="1"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/printing/queuepausecommand.xml b/docs-xml/smbdotconf/printing/queuepausecommand.xml
index 21b56c9..c396a67 100644
--- a/docs-xml/smbdotconf/printing/queuepausecommand.xml
+++ b/docs-xml/smbdotconf/printing/queuepausecommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="queuepause command"
context="S"
type="string"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies the command to be
diff --git a/docs-xml/smbdotconf/printing/queueresumecommand.xml b/docs-xml/smbdotconf/printing/queueresumecommand.xml
index 749bb02..ec1fb97 100644
--- a/docs-xml/smbdotconf/printing/queueresumecommand.xml
+++ b/docs-xml/smbdotconf/printing/queueresumecommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="queueresume command"
context="S"
type="string"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies the command to be
diff --git a/docs-xml/smbdotconf/printing/showaddprinterwizard.xml b/docs-xml/smbdotconf/printing/showaddprinterwizard.xml
index f24bdb5..542ca0b 100644
--- a/docs-xml/smbdotconf/printing/showaddprinterwizard.xml
+++ b/docs-xml/smbdotconf/printing/showaddprinterwizard.xml
@@ -1,7 +1,6 @@
<samba:parameter name="show add printer wizard"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>With the introduction of MS-RPC based printing support
diff --git a/docs-xml/smbdotconf/printing/spoolssarchitecture.xml b/docs-xml/smbdotconf/printing/spoolssarchitecture.xml
index 5ce9f13..a0739d5 100644
--- a/docs-xml/smbdotconf/printing/spoolssarchitecture.xml
+++ b/docs-xml/smbdotconf/printing/spoolssarchitecture.xml
@@ -1,8 +1,6 @@
<samba:parameter name="spoolss: architecture"
context="G"
type="string"
- advanced="1"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Windows spoolss print clients only allow association of server-side drivers
diff --git a/docs-xml/smbdotconf/printing/spoolssosversion.xml b/docs-xml/smbdotconf/printing/spoolssosversion.xml
index a63a4ce..cd568e7 100644
--- a/docs-xml/smbdotconf/printing/spoolssosversion.xml
+++ b/docs-xml/smbdotconf/printing/spoolssosversion.xml
@@ -1,8 +1,6 @@
<samba:parameter name="spoolss: os_major"
context="G"
type="integer"
- advanced="1"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Windows might require a new os version number. This option allows
@@ -17,8 +15,6 @@
<samba:parameter name="spoolss: os_minor"
context="G"
type="integer"
- advanced="1"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Windows might require a new os version number. This option allows
@@ -33,8 +29,6 @@
<samba:parameter name="spoolss: os_build"
context="G"
type="integer"
- advanced="1"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Windows might require a new os version number. This option allows
diff --git a/docs-xml/smbdotconf/printing/useclientdriver.xml b/docs-xml/smbdotconf/printing/useclientdriver.xml
index ecb9c3c..47fbb3e 100644
--- a/docs-xml/smbdotconf/printing/useclientdriver.xml
+++ b/docs-xml/smbdotconf/printing/useclientdriver.xml
@@ -1,7 +1,6 @@
<samba:parameter name="use client driver"
context="S"
type="boolean"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter applies only to Windows NT/2000
--
2.1.0
From 82e4202f5655467ef7967ba50930afa71c3ff5c1 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 28 Apr 2015 23:52:42 +0200
Subject: [PATCH 16/22] docs:smbdotconf: remove swat-specific flags from
protocol/
Signed-off-by: Michael Adam <obnox at samba.org>
---
docs-xml/smbdotconf/protocol/aclallowexecutealways.xml | 1 -
docs-xml/smbdotconf/protocol/aclcheckpermissions.xml | 1 -
docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml | 1 -
docs-xml/smbdotconf/protocol/cldapport.xml | 1 -
docs-xml/smbdotconf/protocol/clientmaxprotocol.xml | 1 -
docs-xml/smbdotconf/protocol/clientminprotocol.xml | 1 -
docs-xml/smbdotconf/protocol/clientusespnego.xml | 1 -
docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml | 1 -
docs-xml/smbdotconf/protocol/defersharingviolations.xml | 1 -
docs-xml/smbdotconf/protocol/dgramport.xml | 1 -
docs-xml/smbdotconf/protocol/disablenetbios.xml | 1 -
docs-xml/smbdotconf/protocol/durablehandles.xml | 1 -
docs-xml/smbdotconf/protocol/easupport.xml | 1 -
docs-xml/smbdotconf/protocol/enableasusupport.xml | 1 -
docs-xml/smbdotconf/protocol/largereadwrite.xml | 1 -
docs-xml/smbdotconf/protocol/mapaclinherit.xml | 1 -
docs-xml/smbdotconf/protocol/maxmux.xml | 1 -
docs-xml/smbdotconf/protocol/maxttl.xml | 1 -
docs-xml/smbdotconf/protocol/maxwinsttl.xml | 1 -
docs-xml/smbdotconf/protocol/maxxmit.xml | 1 -
docs-xml/smbdotconf/protocol/minreceivefilesize.xml | 1 -
docs-xml/smbdotconf/protocol/minwinsttl.xml | 1 -
docs-xml/smbdotconf/protocol/nameresolveorder.xml | 1 -
docs-xml/smbdotconf/protocol/nbtport.xml | 1 -
docs-xml/smbdotconf/protocol/ntaclsupport.xml | 1 -
docs-xml/smbdotconf/protocol/ntpipesupport.xml | 1 -
docs-xml/smbdotconf/protocol/ntstatussupport.xml | 1 -
docs-xml/smbdotconf/protocol/profileacls.xml | 1 -
docs-xml/smbdotconf/protocol/readraw.xml | 1 -
docs-xml/smbdotconf/protocol/rpcbigendian.xml | 1 -
docs-xml/smbdotconf/protocol/servermaxprotocol.xml | 1 -
docs-xml/smbdotconf/protocol/serverminprotocol.xml | 1 -
docs-xml/smbdotconf/protocol/sharefakefscaps.xml | 1 -
docs-xml/smbdotconf/protocol/smb2maxcredits.xml | 1 -
docs-xml/smbdotconf/protocol/smb2maxread.xml | 1 -
docs-xml/smbdotconf/protocol/smb2maxtrans.xml | 1 -
docs-xml/smbdotconf/protocol/smb2maxwrite.xml | 1 -
docs-xml/smbdotconf/protocol/smbports.xml | 1 -
docs-xml/smbdotconf/protocol/timeserver.xml | 1 -
docs-xml/smbdotconf/protocol/unicode.xml | 1 -
docs-xml/smbdotconf/protocol/unixextensions.xml | 1 -
docs-xml/smbdotconf/protocol/usespnego.xml | 1 -
docs-xml/smbdotconf/protocol/webport.xml | 1 -
docs-xml/smbdotconf/protocol/writeraw.xml | 1 -
44 files changed, 44 deletions(-)
diff --git a/docs-xml/smbdotconf/protocol/aclallowexecutealways.xml b/docs-xml/smbdotconf/protocol/aclallowexecutealways.xml
index 672e891..60ffb34 100644
--- a/docs-xml/smbdotconf/protocol/aclallowexecutealways.xml
+++ b/docs-xml/smbdotconf/protocol/aclallowexecutealways.xml
@@ -1,7 +1,6 @@
<samba:parameter name="acl allow execute always"
context="S"
type="boolean"
- advanced="1" wizard="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml b/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
index 6b6866e..91d2b3f 100644
--- a/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
+++ b/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
@@ -1,7 +1,6 @@
<samba:parameter name="acl check permissions"
context="S"
type="boolean"
- advanced="1" wizard="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Please note this parameter is now deprecated in Samba 3.6.2 and will be removed
diff --git a/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml b/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml
index 450a967..33b6e51 100644
--- a/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml
+++ b/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml
@@ -1,7 +1,6 @@
<samba:parameter name="acl map full control"
context="S"
type="boolean"
- advanced="1" wizard="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/protocol/cldapport.xml b/docs-xml/smbdotconf/protocol/cldapport.xml
index c5f7606..ed41f11 100644
--- a/docs-xml/smbdotconf/protocol/cldapport.xml
+++ b/docs-xml/smbdotconf/protocol/cldapport.xml
@@ -1,7 +1,6 @@
<samba:parameter name="cldap port"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option controls the port used by the CLDAP protocol.
diff --git a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
index 9321d3f..1b16814 100644
--- a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
@@ -1,7 +1,6 @@
<samba:parameter name="client max protocol"
context="G"
type="enum"
- developer="1"
function="_client_max_protocol"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/protocol/clientminprotocol.xml b/docs-xml/smbdotconf/protocol/clientminprotocol.xml
index 84e03ea..c906a15 100644
--- a/docs-xml/smbdotconf/protocol/clientminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientminprotocol.xml
@@ -1,7 +1,6 @@
<samba:parameter name="client min protocol"
context="G"
type="enum"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This setting controls the minimum protocol version that the
diff --git a/docs-xml/smbdotconf/protocol/clientusespnego.xml b/docs-xml/smbdotconf/protocol/clientusespnego.xml
index c688a65..b95ad0e 100644
--- a/docs-xml/smbdotconf/protocol/clientusespnego.xml
+++ b/docs-xml/smbdotconf/protocol/clientusespnego.xml
@@ -1,7 +1,6 @@
<samba:parameter name="client use spnego"
context="G"
type="boolean"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para> This variable controls whether Samba clients will try
diff --git a/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml b/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml
index 25ccd23..7fc172b 100644
--- a/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml
+++ b/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml
@@ -1,7 +1,6 @@
<samba:parameter name="dcerpc endpoint servers"
context="G"
type="list"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Specifies which DCE/RPC endpoint servers should be run.</para>
diff --git a/docs-xml/smbdotconf/protocol/defersharingviolations.xml b/docs-xml/smbdotconf/protocol/defersharingviolations.xml
index 00ee27d..bf3b524 100644
--- a/docs-xml/smbdotconf/protocol/defersharingviolations.xml
+++ b/docs-xml/smbdotconf/protocol/defersharingviolations.xml
@@ -1,7 +1,6 @@
<samba:parameter name="defer sharing violations"
context="G"
type="boolean"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/protocol/dgramport.xml b/docs-xml/smbdotconf/protocol/dgramport.xml
index a90310d..cac7243 100644
--- a/docs-xml/smbdotconf/protocol/dgramport.xml
+++ b/docs-xml/smbdotconf/protocol/dgramport.xml
@@ -1,7 +1,6 @@
<samba:parameter name="dgram port"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Specifies which ports the server should listen on for NetBIOS datagram traffic.</para>
diff --git a/docs-xml/smbdotconf/protocol/disablenetbios.xml b/docs-xml/smbdotconf/protocol/disablenetbios.xml
index e78cb8c..a7b5759 100644
--- a/docs-xml/smbdotconf/protocol/disablenetbios.xml
+++ b/docs-xml/smbdotconf/protocol/disablenetbios.xml
@@ -1,7 +1,6 @@
<samba:parameter name="disable netbios"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Enabling this parameter will disable netbios support
diff --git a/docs-xml/smbdotconf/protocol/durablehandles.xml b/docs-xml/smbdotconf/protocol/durablehandles.xml
index 011fabd..4267b29 100644
--- a/docs-xml/smbdotconf/protocol/durablehandles.xml
+++ b/docs-xml/smbdotconf/protocol/durablehandles.xml
@@ -1,6 +1,5 @@
<samba:parameter name="durable handles"
context="S"
- advanced="1"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/protocol/easupport.xml b/docs-xml/smbdotconf/protocol/easupport.xml
index ba210fd..fc37f71 100644
--- a/docs-xml/smbdotconf/protocol/easupport.xml
+++ b/docs-xml/smbdotconf/protocol/easupport.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ea support"
context="S"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This boolean parameter controls whether <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/enableasusupport.xml b/docs-xml/smbdotconf/protocol/enableasusupport.xml
index 8f25103..f938ed80 100644
--- a/docs-xml/smbdotconf/protocol/enableasusupport.xml
+++ b/docs-xml/smbdotconf/protocol/enableasusupport.xml
@@ -1,6 +1,5 @@
<samba:parameter name="enable asu support"
context="G"
- advanced="1" developer="1"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/protocol/largereadwrite.xml b/docs-xml/smbdotconf/protocol/largereadwrite.xml
index 0b4158d..5a34bfd 100644
--- a/docs-xml/smbdotconf/protocol/largereadwrite.xml
+++ b/docs-xml/smbdotconf/protocol/largereadwrite.xml
@@ -1,7 +1,6 @@
<samba:parameter name="large readwrite"
context="G"
type="boolean"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter determines whether or not
diff --git a/docs-xml/smbdotconf/protocol/mapaclinherit.xml b/docs-xml/smbdotconf/protocol/mapaclinherit.xml
index ef0b4eb..5b2de34 100644
--- a/docs-xml/smbdotconf/protocol/mapaclinherit.xml
+++ b/docs-xml/smbdotconf/protocol/mapaclinherit.xml
@@ -1,7 +1,6 @@
<samba:parameter name="map acl inherit"
context="S"
type="boolean"
- advanced="1" wizard="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This boolean parameter controls whether <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/maxmux.xml b/docs-xml/smbdotconf/protocol/maxmux.xml
index 71998c9..8281722 100644
--- a/docs-xml/smbdotconf/protocol/maxmux.xml
+++ b/docs-xml/smbdotconf/protocol/maxmux.xml
@@ -1,6 +1,5 @@
<samba:parameter name="max mux"
context="G"
- advanced="1" developer="1"
type="integer"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/protocol/maxttl.xml b/docs-xml/smbdotconf/protocol/maxttl.xml
index 00f735d..8813b40 100644
--- a/docs-xml/smbdotconf/protocol/maxttl.xml
+++ b/docs-xml/smbdotconf/protocol/maxttl.xml
@@ -1,7 +1,6 @@
<samba:parameter name="max ttl"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option tells <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/maxwinsttl.xml b/docs-xml/smbdotconf/protocol/maxwinsttl.xml
index 09935cd..6c37a03 100644
--- a/docs-xml/smbdotconf/protocol/maxwinsttl.xml
+++ b/docs-xml/smbdotconf/protocol/maxwinsttl.xml
@@ -1,7 +1,6 @@
<samba:parameter name="max wins ttl"
type="integer"
context="G"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option tells <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/maxxmit.xml b/docs-xml/smbdotconf/protocol/maxxmit.xml
index 3804ae2..875efa0 100644
--- a/docs-xml/smbdotconf/protocol/maxxmit.xml
+++ b/docs-xml/smbdotconf/protocol/maxxmit.xml
@@ -1,7 +1,6 @@
<samba:parameter name="max xmit"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option controls the maximum packet size
diff --git a/docs-xml/smbdotconf/protocol/minreceivefilesize.xml b/docs-xml/smbdotconf/protocol/minreceivefilesize.xml
index 0bad7f8..4f40ecf 100644
--- a/docs-xml/smbdotconf/protocol/minreceivefilesize.xml
+++ b/docs-xml/smbdotconf/protocol/minreceivefilesize.xml
@@ -1,7 +1,6 @@
<samba:parameter name="min receivefile size"
type="integer"
context="G"
- advanced="1" developer="1"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/protocol/minwinsttl.xml b/docs-xml/smbdotconf/protocol/minwinsttl.xml
index 38fbd7b..dbeb6d1 100644
--- a/docs-xml/smbdotconf/protocol/minwinsttl.xml
+++ b/docs-xml/smbdotconf/protocol/minwinsttl.xml
@@ -1,7 +1,6 @@
<samba:parameter name="min wins ttl"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option tells <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/nameresolveorder.xml b/docs-xml/smbdotconf/protocol/nameresolveorder.xml
index 662c3fb..17a4d95 100644
--- a/docs-xml/smbdotconf/protocol/nameresolveorder.xml
+++ b/docs-xml/smbdotconf/protocol/nameresolveorder.xml
@@ -1,7 +1,6 @@
<samba:parameter name="name resolve order"
context="G"
type="list"
- advanced="1" wizard="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option is used by the programs in the Samba
diff --git a/docs-xml/smbdotconf/protocol/nbtport.xml b/docs-xml/smbdotconf/protocol/nbtport.xml
index f7ec1e7..0c06d7ca 100644
--- a/docs-xml/smbdotconf/protocol/nbtport.xml
+++ b/docs-xml/smbdotconf/protocol/nbtport.xml
@@ -1,7 +1,6 @@
<samba:parameter name="nbt port"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Specifies which port the server should use for NetBIOS over IP name
diff --git a/docs-xml/smbdotconf/protocol/ntaclsupport.xml b/docs-xml/smbdotconf/protocol/ntaclsupport.xml
index 451d5d8..7938110 100644
--- a/docs-xml/smbdotconf/protocol/ntaclsupport.xml
+++ b/docs-xml/smbdotconf/protocol/ntaclsupport.xml
@@ -1,6 +1,5 @@
<samba:parameter name="nt acl support"
context="S"
- advanced="1" wizard="1"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/protocol/ntpipesupport.xml b/docs-xml/smbdotconf/protocol/ntpipesupport.xml
index 7c31084..9acfeda 100644
--- a/docs-xml/smbdotconf/protocol/ntpipesupport.xml
+++ b/docs-xml/smbdotconf/protocol/ntpipesupport.xml
@@ -1,6 +1,5 @@
<samba:parameter name="nt pipe support"
context="G"
- advanced="1" developer="1"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/protocol/ntstatussupport.xml b/docs-xml/smbdotconf/protocol/ntstatussupport.xml
index 4dfc142..961e2ae 100644
--- a/docs-xml/smbdotconf/protocol/ntstatussupport.xml
+++ b/docs-xml/smbdotconf/protocol/ntstatussupport.xml
@@ -1,7 +1,6 @@
<samba:parameter name="nt status support"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This boolean parameter controls whether <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/profileacls.xml b/docs-xml/smbdotconf/protocol/profileacls.xml
index be89753..956e41f 100644
--- a/docs-xml/smbdotconf/protocol/profileacls.xml
+++ b/docs-xml/smbdotconf/protocol/profileacls.xml
@@ -1,7 +1,6 @@
<samba:parameter name="profile acls"
context="S"
type="boolean"
- advanced="1" wizard="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/protocol/readraw.xml b/docs-xml/smbdotconf/protocol/readraw.xml
index fb54cc0..f660b01 100644
--- a/docs-xml/smbdotconf/protocol/readraw.xml
+++ b/docs-xml/smbdotconf/protocol/readraw.xml
@@ -1,7 +1,6 @@
<samba:parameter name="read raw"
context="G"
type="boolean"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This is ignored if <smbconfoption name="async echo handler"/> is set,
diff --git a/docs-xml/smbdotconf/protocol/rpcbigendian.xml b/docs-xml/smbdotconf/protocol/rpcbigendian.xml
index 7989e7e..1933054 100644
--- a/docs-xml/smbdotconf/protocol/rpcbigendian.xml
+++ b/docs-xml/smbdotconf/protocol/rpcbigendian.xml
@@ -1,7 +1,6 @@
<samba:parameter name="rpc big endian"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Setting this option will force the RPC client and server to
diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
index 822e42b..41532a9 100644
--- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
@@ -1,7 +1,6 @@
<samba:parameter name="server max protocol"
context="G"
type="enum"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>The value of the parameter (a string) is the highest
diff --git a/docs-xml/smbdotconf/protocol/serverminprotocol.xml b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
index fc249fc..25457d9 100644
--- a/docs-xml/smbdotconf/protocol/serverminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
@@ -1,7 +1,6 @@
<samba:parameter name="server min protocol"
context="G"
type="enum"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>min protocol</synonym>
<description>
diff --git a/docs-xml/smbdotconf/protocol/sharefakefscaps.xml b/docs-xml/smbdotconf/protocol/sharefakefscaps.xml
index 713b95b..8709a28 100644
--- a/docs-xml/smbdotconf/protocol/sharefakefscaps.xml
+++ b/docs-xml/smbdotconf/protocol/sharefakefscaps.xml
@@ -1,7 +1,6 @@
<samba:parameter name="share:fake_fscaps"
context="G"
type="string"
- advanced="1" developer="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxcredits.xml b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
index f349c4c..ef2ad48 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
@@ -1,7 +1,6 @@
<samba:parameter name="smb2 max credits"
type="integer"
context="G"
- advanced="1" developer="1"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxread.xml b/docs-xml/smbdotconf/protocol/smb2maxread.xml
index 3b18531..9d05290 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxread.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxread.xml
@@ -1,7 +1,6 @@
<samba:parameter name="smb2 max read"
type="integer"
context="G"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option specifies the protocol value that <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
index 64225a5..a1998c9 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
@@ -1,7 +1,6 @@
<samba:parameter name="smb2 max trans"
type="integer"
context="G"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option specifies the protocol value that <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
index 4e7103c..5048d47 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
@@ -1,7 +1,6 @@
<samba:parameter name="smb2 max write"
type="integer"
context="G"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option specifies the protocol value that <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/smbports.xml b/docs-xml/smbdotconf/protocol/smbports.xml
index aaf4919..f21fe7f 100644
--- a/docs-xml/smbdotconf/protocol/smbports.xml
+++ b/docs-xml/smbdotconf/protocol/smbports.xml
@@ -1,7 +1,6 @@
<samba:parameter name="smb ports"
context="G"
type="list"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Specifies which ports the server should listen on for SMB traffic.</para>
diff --git a/docs-xml/smbdotconf/protocol/timeserver.xml b/docs-xml/smbdotconf/protocol/timeserver.xml
index 93d8918..f907fba 100644
--- a/docs-xml/smbdotconf/protocol/timeserver.xml
+++ b/docs-xml/smbdotconf/protocol/timeserver.xml
@@ -1,7 +1,6 @@
<samba:parameter name="time server"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter determines if <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/unicode.xml b/docs-xml/smbdotconf/protocol/unicode.xml
index dfcd1d8..f7a2350 100644
--- a/docs-xml/smbdotconf/protocol/unicode.xml
+++ b/docs-xml/smbdotconf/protocol/unicode.xml
@@ -1,7 +1,6 @@
<samba:parameter name="unicode"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Specifies whether the server and client should support unicode.</para>
diff --git a/docs-xml/smbdotconf/protocol/unixextensions.xml b/docs-xml/smbdotconf/protocol/unixextensions.xml
index 61a39cb..9bcf01d 100644
--- a/docs-xml/smbdotconf/protocol/unixextensions.xml
+++ b/docs-xml/smbdotconf/protocol/unixextensions.xml
@@ -1,7 +1,6 @@
<samba:parameter name="unix extensions"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This boolean parameter controls whether Samba
diff --git a/docs-xml/smbdotconf/protocol/usespnego.xml b/docs-xml/smbdotconf/protocol/usespnego.xml
index 5c2abcc..1bdb4ba 100644
--- a/docs-xml/smbdotconf/protocol/usespnego.xml
+++ b/docs-xml/smbdotconf/protocol/usespnego.xml
@@ -1,7 +1,6 @@
<samba:parameter name="use spnego"
context="G"
type="boolean"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This deprecated variable controls whether samba will try
diff --git a/docs-xml/smbdotconf/protocol/webport.xml b/docs-xml/smbdotconf/protocol/webport.xml
index 77eeef4..7cc55b0 100644
--- a/docs-xml/smbdotconf/protocol/webport.xml
+++ b/docs-xml/smbdotconf/protocol/webport.xml
@@ -1,7 +1,6 @@
<samba:parameter name="web port"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Specifies which port the Samba web server should listen on.</para>
diff --git a/docs-xml/smbdotconf/protocol/writeraw.xml b/docs-xml/smbdotconf/protocol/writeraw.xml
index fb9e386..599104e 100644
--- a/docs-xml/smbdotconf/protocol/writeraw.xml
+++ b/docs-xml/smbdotconf/protocol/writeraw.xml
@@ -1,7 +1,6 @@
<samba:parameter name="write raw"
context="G"
type="boolean"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This is ignored if <smbconfoption name="async echo handler"/> is set,
--
2.1.0
From 826df66243ce0811ebbb4952b8e5f829fb47dbd2 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Wed, 29 Apr 2015 00:11:57 +0200
Subject: [PATCH 17/22] docs:smbdotconf: remove swat-specific flags from
security/
Signed-off-by: Michael Adam <obnox at samba.org>
---
docs-xml/smbdotconf/security/accessbasedshareenum.xml | 1 -
docs-xml/smbdotconf/security/algorithmicridbase.xml | 1 -
docs-xml/smbdotconf/security/allowtrusteddomains.xml | 1 -
docs-xml/smbdotconf/security/authmethods.xml | 1 -
docs-xml/smbdotconf/security/checkpasswordscript.xml | 1 -
docs-xml/smbdotconf/security/clientlanmanauth.xml | 1 -
docs-xml/smbdotconf/security/clientntlmv2auth.xml | 1 -
docs-xml/smbdotconf/security/clientplaintextauth.xml | 1 -
docs-xml/smbdotconf/security/clientschannel.xml | 1 -
docs-xml/smbdotconf/security/clientsigning.xml | 1 -
docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml | 1 -
docs-xml/smbdotconf/security/dedicatedkeytabfile.xml | 1 -
docs-xml/smbdotconf/security/encryptpasswords.xml | 1 -
docs-xml/smbdotconf/security/guestaccount.xml | 1 -
docs-xml/smbdotconf/security/guestok.xml | 1 -
docs-xml/smbdotconf/security/hostsallow.xml | 1 -
docs-xml/smbdotconf/security/hostsdeny.xml | 1 -
docs-xml/smbdotconf/security/kerberosmethod.xml | 1 -
docs-xml/smbdotconf/security/kpasswdport.xml | 1 -
docs-xml/smbdotconf/security/krb5port.xml | 1 -
docs-xml/smbdotconf/security/lanmanauth.xml | 1 -
docs-xml/smbdotconf/security/lognttokencommand.xml | 1 -
docs-xml/smbdotconf/security/maptoguest.xml | 1 -
docs-xml/smbdotconf/security/mapuntrustedtodomain.xml | 2 --
docs-xml/smbdotconf/security/ntlmauth.xml | 1 -
docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml | 1 -
docs-xml/smbdotconf/security/nullpasswords.xml | 1 -
docs-xml/smbdotconf/security/obeypamrestrictions.xml | 1 -
docs-xml/smbdotconf/security/oldpasswordallowedperiod.xml | 1 -
docs-xml/smbdotconf/security/pampasswordchange.xml | 1 -
docs-xml/smbdotconf/security/passdbbackend.xml | 1 -
docs-xml/smbdotconf/security/passdbexpandexplicit.xml | 1 -
docs-xml/smbdotconf/security/passwdchat.xml | 1 -
docs-xml/smbdotconf/security/passwdchatdebug.xml | 1 -
docs-xml/smbdotconf/security/passwdchattimeout.xml | 1 -
docs-xml/smbdotconf/security/passwdprogram.xml | 1 -
docs-xml/smbdotconf/security/passwordserver.xml | 1 -
docs-xml/smbdotconf/security/preloadmodules.xml | 1 -
docs-xml/smbdotconf/security/privatedir.xml | 1 -
docs-xml/smbdotconf/security/readonly.xml | 1 -
docs-xml/smbdotconf/security/renameuserscript.xml | 1 -
docs-xml/smbdotconf/security/restrictanonymous.xml | 1 -
docs-xml/smbdotconf/security/rootdirectory.xml | 1 -
docs-xml/smbdotconf/security/sambakcccommand.xml | 1 -
docs-xml/smbdotconf/security/security.xml | 1 -
docs-xml/smbdotconf/security/serverrole.xml | 1 -
docs-xml/smbdotconf/security/serverschannel.xml | 1 -
docs-xml/smbdotconf/security/serversigning.xml | 1 -
docs-xml/smbdotconf/security/smbencrypt.xml | 1 -
docs-xml/smbdotconf/security/smbpasswdfile.xml | 1 -
docs-xml/smbdotconf/security/tlscafile.xml | 1 -
docs-xml/smbdotconf/security/tlscertfile.xml | 1 -
docs-xml/smbdotconf/security/tlscrlfile.xml | 1 -
docs-xml/smbdotconf/security/tlsdhparamsfile.xml | 1 -
docs-xml/smbdotconf/security/tlsenabled.xml | 1 -
docs-xml/smbdotconf/security/tlskeyfile.xml | 1 -
docs-xml/smbdotconf/security/unixpasswordsync.xml | 1 -
docs-xml/smbdotconf/security/usernamelevel.xml | 1 -
docs-xml/smbdotconf/security/usernamemap.xml | 1 -
docs-xml/smbdotconf/security/usernamemapcachetime.xml | 1 -
docs-xml/smbdotconf/security/usernamemapscript.xml | 1 -
61 files changed, 62 deletions(-)
diff --git a/docs-xml/smbdotconf/security/accessbasedshareenum.xml b/docs-xml/smbdotconf/security/accessbasedshareenum.xml
index 66932d0..b33c4a5 100644
--- a/docs-xml/smbdotconf/security/accessbasedshareenum.xml
+++ b/docs-xml/smbdotconf/security/accessbasedshareenum.xml
@@ -1,7 +1,6 @@
<samba:parameter name="access based share enum"
type="boolean"
context="S"
- basic="1" advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>If this parameter is <constant>yes</constant> for a
diff --git a/docs-xml/smbdotconf/security/algorithmicridbase.xml b/docs-xml/smbdotconf/security/algorithmicridbase.xml
index bcf3ef6..4df3c3d 100644
--- a/docs-xml/smbdotconf/security/algorithmicridbase.xml
+++ b/docs-xml/smbdotconf/security/algorithmicridbase.xml
@@ -1,6 +1,5 @@
<samba:parameter name="algorithmic rid base"
context="G"
- advanced="1" developer="1"
type="integer"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/allowtrusteddomains.xml b/docs-xml/smbdotconf/security/allowtrusteddomains.xml
index 57bf1d2..806bab72 100644
--- a/docs-xml/smbdotconf/security/allowtrusteddomains.xml
+++ b/docs-xml/smbdotconf/security/allowtrusteddomains.xml
@@ -1,7 +1,6 @@
<samba:parameter name="allow trusted domains"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/security/authmethods.xml b/docs-xml/smbdotconf/security/authmethods.xml
index 39d211d..813c4cb 100644
--- a/docs-xml/smbdotconf/security/authmethods.xml
+++ b/docs-xml/smbdotconf/security/authmethods.xml
@@ -1,7 +1,6 @@
<samba:parameter name="auth methods"
context="G"
type="list"
- basic="1" advanced="1" wizard="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/checkpasswordscript.xml b/docs-xml/smbdotconf/security/checkpasswordscript.xml
index df551a6..7399744 100644
--- a/docs-xml/smbdotconf/security/checkpasswordscript.xml
+++ b/docs-xml/smbdotconf/security/checkpasswordscript.xml
@@ -1,7 +1,6 @@
<samba:parameter name="check password script"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>The name of a program that can be used to check password
diff --git a/docs-xml/smbdotconf/security/clientlanmanauth.xml b/docs-xml/smbdotconf/security/clientlanmanauth.xml
index 9c61ded..4147f34 100644
--- a/docs-xml/smbdotconf/security/clientlanmanauth.xml
+++ b/docs-xml/smbdotconf/security/clientlanmanauth.xml
@@ -1,7 +1,6 @@
<samba:parameter name="client lanman auth"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter determines whether or not <citerefentry><refentrytitle>smbclient</refentrytitle>
diff --git a/docs-xml/smbdotconf/security/clientntlmv2auth.xml b/docs-xml/smbdotconf/security/clientntlmv2auth.xml
index 7f30356..d0f0a37 100644
--- a/docs-xml/smbdotconf/security/clientntlmv2auth.xml
+++ b/docs-xml/smbdotconf/security/clientntlmv2auth.xml
@@ -1,7 +1,6 @@
<samba:parameter name="client NTLMv2 auth"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter determines whether or not <citerefentry><refentrytitle>smbclient</refentrytitle>
diff --git a/docs-xml/smbdotconf/security/clientplaintextauth.xml b/docs-xml/smbdotconf/security/clientplaintextauth.xml
index c406155..f640416 100644
--- a/docs-xml/smbdotconf/security/clientplaintextauth.xml
+++ b/docs-xml/smbdotconf/security/clientplaintextauth.xml
@@ -1,7 +1,6 @@
<samba:parameter name="client plaintext auth"
context="G"
type="boolean"
- basic="1" advanced="1" wizard="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Specifies whether a client should send a plaintext
diff --git a/docs-xml/smbdotconf/security/clientschannel.xml b/docs-xml/smbdotconf/security/clientschannel.xml
index d293ee3..62a47fe 100644
--- a/docs-xml/smbdotconf/security/clientschannel.xml
+++ b/docs-xml/smbdotconf/security/clientschannel.xml
@@ -1,6 +1,5 @@
<samba:parameter name="client schannel"
context="G"
- basic="1"
type="enum"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/clientsigning.xml b/docs-xml/smbdotconf/security/clientsigning.xml
index 3b5687f..60b8ffe 100644
--- a/docs-xml/smbdotconf/security/clientsigning.xml
+++ b/docs-xml/smbdotconf/security/clientsigning.xml
@@ -1,7 +1,6 @@
<samba:parameter name="client signing"
context="G"
type="enum"
- basic="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This controls whether the client is allowed or required to use SMB signing. Possible values
diff --git a/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml b/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml
index 792a738..1d8214e 100644
--- a/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml
+++ b/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml
@@ -1,7 +1,6 @@
<samba:parameter name="client use spnego principal"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter determines whether or not
diff --git a/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml b/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml
index 79fba82..c8d6c2d 100644
--- a/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml
+++ b/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml
@@ -1,5 +1,4 @@
<samba:parameter name="dedicated keytab file" context="G" type="string"
- advanced="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/encryptpasswords.xml b/docs-xml/smbdotconf/security/encryptpasswords.xml
index fdf0cfd..4b7d50e 100644
--- a/docs-xml/smbdotconf/security/encryptpasswords.xml
+++ b/docs-xml/smbdotconf/security/encryptpasswords.xml
@@ -1,7 +1,6 @@
<samba:parameter name="encrypt passwords"
context="G"
type="boolean"
- basic="1" advanced="1" wizard="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This boolean controls whether encrypted passwords
diff --git a/docs-xml/smbdotconf/security/guestaccount.xml b/docs-xml/smbdotconf/security/guestaccount.xml
index 9804a2b..905e795 100644
--- a/docs-xml/smbdotconf/security/guestaccount.xml
+++ b/docs-xml/smbdotconf/security/guestaccount.xml
@@ -1,7 +1,6 @@
<samba:parameter name="guest account"
context="G"
type="string"
- basic="1" advanced="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/guestok.xml b/docs-xml/smbdotconf/security/guestok.xml
index f4b2c74..7a07ff1 100644
--- a/docs-xml/smbdotconf/security/guestok.xml
+++ b/docs-xml/smbdotconf/security/guestok.xml
@@ -1,7 +1,6 @@
<samba:parameter name="guest ok"
type="boolean"
context="S"
- basic="1" advanced="1" print="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>public</synonym>
<description>
diff --git a/docs-xml/smbdotconf/security/hostsallow.xml b/docs-xml/smbdotconf/security/hostsallow.xml
index 849b515f..35be404 100644
--- a/docs-xml/smbdotconf/security/hostsallow.xml
+++ b/docs-xml/smbdotconf/security/hostsallow.xml
@@ -1,7 +1,6 @@
<samba:parameter name="hosts allow"
context="S"
type="list"
- basic="1" advanced="1" print="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>allow hosts</synonym>
<description>
diff --git a/docs-xml/smbdotconf/security/hostsdeny.xml b/docs-xml/smbdotconf/security/hostsdeny.xml
index 136f86c..2421a4e 100644
--- a/docs-xml/smbdotconf/security/hostsdeny.xml
+++ b/docs-xml/smbdotconf/security/hostsdeny.xml
@@ -1,7 +1,6 @@
<samba:parameter name="hosts deny"
context="S"
type="list"
- basic="1" advanced="1" print="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>deny hosts</synonym>
<description>
diff --git a/docs-xml/smbdotconf/security/kerberosmethod.xml b/docs-xml/smbdotconf/security/kerberosmethod.xml
index 9cd3530..a4948f2 100644
--- a/docs-xml/smbdotconf/security/kerberosmethod.xml
+++ b/docs-xml/smbdotconf/security/kerberosmethod.xml
@@ -1,5 +1,4 @@
<samba:parameter name="kerberos method" context="G" type="enum"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/security/kpasswdport.xml b/docs-xml/smbdotconf/security/kpasswdport.xml
index 419e866..0555e78 100644
--- a/docs-xml/smbdotconf/security/kpasswdport.xml
+++ b/docs-xml/smbdotconf/security/kpasswdport.xml
@@ -1,7 +1,6 @@
<samba:parameter name="kpasswd port"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Specifies which ports the Kerberos server should listen on for
diff --git a/docs-xml/smbdotconf/security/krb5port.xml b/docs-xml/smbdotconf/security/krb5port.xml
index e810534..6c4f0a8 100644
--- a/docs-xml/smbdotconf/security/krb5port.xml
+++ b/docs-xml/smbdotconf/security/krb5port.xml
@@ -1,7 +1,6 @@
<samba:parameter name="krb5 port"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Specifies which port the KDC should listen on for Kerberos traffic.</para>
diff --git a/docs-xml/smbdotconf/security/lanmanauth.xml b/docs-xml/smbdotconf/security/lanmanauth.xml
index e055bd3..44d18c4 100644
--- a/docs-xml/smbdotconf/security/lanmanauth.xml
+++ b/docs-xml/smbdotconf/security/lanmanauth.xml
@@ -1,7 +1,6 @@
<samba:parameter name="lanman auth"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter determines whether or not <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/security/lognttokencommand.xml b/docs-xml/smbdotconf/security/lognttokencommand.xml
index 33ec23b..66ec6c9 100644
--- a/docs-xml/smbdotconf/security/lognttokencommand.xml
+++ b/docs-xml/smbdotconf/security/lognttokencommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="log nt token command"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option can be set to a command that will be called when new nt
diff --git a/docs-xml/smbdotconf/security/maptoguest.xml b/docs-xml/smbdotconf/security/maptoguest.xml
index 09017bc..2e4c634 100644
--- a/docs-xml/smbdotconf/security/maptoguest.xml
+++ b/docs-xml/smbdotconf/security/maptoguest.xml
@@ -1,7 +1,6 @@
<samba:parameter name="map to guest"
type="enum"
context="G"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter can take four different values, which tell
diff --git a/docs-xml/smbdotconf/security/mapuntrustedtodomain.xml b/docs-xml/smbdotconf/security/mapuntrustedtodomain.xml
index bcf65e6..69f4d82 100644
--- a/docs-xml/smbdotconf/security/mapuntrustedtodomain.xml
+++ b/docs-xml/smbdotconf/security/mapuntrustedtodomain.xml
@@ -1,8 +1,6 @@
<samba:parameter name="map untrusted to domain"
context="G"
type="boolean"
- advanced="1"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/security/ntlmauth.xml b/docs-xml/smbdotconf/security/ntlmauth.xml
index ec603bb..a39f9e5 100644
--- a/docs-xml/smbdotconf/security/ntlmauth.xml
+++ b/docs-xml/smbdotconf/security/ntlmauth.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ntlm auth"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter determines whether or not <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml b/docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml
index ce25d36..a2c92a4 100644
--- a/docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml
+++ b/docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ntp signd socket directory"
context="G"
type="string"
- advanced="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/nullpasswords.xml b/docs-xml/smbdotconf/security/nullpasswords.xml
index 402114e..3d7b2ad 100644
--- a/docs-xml/smbdotconf/security/nullpasswords.xml
+++ b/docs-xml/smbdotconf/security/nullpasswords.xml
@@ -1,6 +1,5 @@
<samba:parameter name="null passwords"
context="G"
- advanced="1" developer="1"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/obeypamrestrictions.xml b/docs-xml/smbdotconf/security/obeypamrestrictions.xml
index 40777f4..e4b2b6c 100644
--- a/docs-xml/smbdotconf/security/obeypamrestrictions.xml
+++ b/docs-xml/smbdotconf/security/obeypamrestrictions.xml
@@ -1,7 +1,6 @@
<samba:parameter name="obey pam restrictions"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>When Samba 3.0 is configured to enable PAM support
diff --git a/docs-xml/smbdotconf/security/oldpasswordallowedperiod.xml b/docs-xml/smbdotconf/security/oldpasswordallowedperiod.xml
index ead720a..718cd32 100644
--- a/docs-xml/smbdotconf/security/oldpasswordallowedperiod.xml
+++ b/docs-xml/smbdotconf/security/oldpasswordallowedperiod.xml
@@ -1,6 +1,5 @@
<samba:parameter name="old password allowed period"
context="G"
- advanced="1"
type="integer"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/pampasswordchange.xml b/docs-xml/smbdotconf/security/pampasswordchange.xml
index e5c04d4..973a10b 100644
--- a/docs-xml/smbdotconf/security/pampasswordchange.xml
+++ b/docs-xml/smbdotconf/security/pampasswordchange.xml
@@ -1,7 +1,6 @@
<samba:parameter name="pam password change"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>With the addition of better PAM support in Samba 2.2,
diff --git a/docs-xml/smbdotconf/security/passdbbackend.xml b/docs-xml/smbdotconf/security/passdbbackend.xml
index 1189d98..4f5321d 100644
--- a/docs-xml/smbdotconf/security/passdbbackend.xml
+++ b/docs-xml/smbdotconf/security/passdbbackend.xml
@@ -1,7 +1,6 @@
<samba:parameter name="passdb backend"
context="G"
type="string"
- advanced="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/passdbexpandexplicit.xml b/docs-xml/smbdotconf/security/passdbexpandexplicit.xml
index 08c8931..778a390 100644
--- a/docs-xml/smbdotconf/security/passdbexpandexplicit.xml
+++ b/docs-xml/smbdotconf/security/passdbexpandexplicit.xml
@@ -1,6 +1,5 @@
<samba:parameter name="passdb expand explicit"
context="G"
- advanced="1" developer="0"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/passwdchat.xml b/docs-xml/smbdotconf/security/passwdchat.xml
index e2f672b..bce0d43 100644
--- a/docs-xml/smbdotconf/security/passwdchat.xml
+++ b/docs-xml/smbdotconf/security/passwdchat.xml
@@ -1,7 +1,6 @@
<samba:parameter name="passwd chat"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This string controls the <emphasis>"chat"</emphasis>
diff --git a/docs-xml/smbdotconf/security/passwdchatdebug.xml b/docs-xml/smbdotconf/security/passwdchatdebug.xml
index 24bcbdb..9046f20 100644
--- a/docs-xml/smbdotconf/security/passwdchatdebug.xml
+++ b/docs-xml/smbdotconf/security/passwdchatdebug.xml
@@ -1,6 +1,5 @@
<samba:parameter name="passwd chat debug"
context="G"
- advanced="1" developer="1"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/passwdchattimeout.xml b/docs-xml/smbdotconf/security/passwdchattimeout.xml
index c371aa2..07374ff 100644
--- a/docs-xml/smbdotconf/security/passwdchattimeout.xml
+++ b/docs-xml/smbdotconf/security/passwdchattimeout.xml
@@ -1,7 +1,6 @@
<samba:parameter name="passwd chat timeout"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This integer specifies the number of seconds smbd will wait for an initial
diff --git a/docs-xml/smbdotconf/security/passwdprogram.xml b/docs-xml/smbdotconf/security/passwdprogram.xml
index 4158c1b..94649e2 100644
--- a/docs-xml/smbdotconf/security/passwdprogram.xml
+++ b/docs-xml/smbdotconf/security/passwdprogram.xml
@@ -1,7 +1,6 @@
<samba:parameter name="passwd program"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>The name of a program that can be used to set
diff --git a/docs-xml/smbdotconf/security/passwordserver.xml b/docs-xml/smbdotconf/security/passwordserver.xml
index 24d4a00..e01adb6 100644
--- a/docs-xml/smbdotconf/security/passwordserver.xml
+++ b/docs-xml/smbdotconf/security/passwordserver.xml
@@ -1,7 +1,6 @@
<samba:parameter name="password server"
context="G"
type="string"
- advanced="1" wizard="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/preloadmodules.xml b/docs-xml/smbdotconf/security/preloadmodules.xml
index 1d985a1..44eb467 100644
--- a/docs-xml/smbdotconf/security/preloadmodules.xml
+++ b/docs-xml/smbdotconf/security/preloadmodules.xml
@@ -1,7 +1,6 @@
<samba:parameter name="preload modules"
type="list"
context="G"
- basic="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This is a list of paths to modules that should
diff --git a/docs-xml/smbdotconf/security/privatedir.xml b/docs-xml/smbdotconf/security/privatedir.xml
index 9142bde..4189f6b 100644
--- a/docs-xml/smbdotconf/security/privatedir.xml
+++ b/docs-xml/smbdotconf/security/privatedir.xml
@@ -1,7 +1,6 @@
<samba:parameter name="private dir"
context="G"
type="string"
- advanced="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>private directory</synonym>
diff --git a/docs-xml/smbdotconf/security/readonly.xml b/docs-xml/smbdotconf/security/readonly.xml
index 612bf0d..f587f67 100644
--- a/docs-xml/smbdotconf/security/readonly.xml
+++ b/docs-xml/smbdotconf/security/readonly.xml
@@ -1,7 +1,6 @@
<samba:parameter name="read only"
context="S"
type="boolean"
- basic="1" advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>write ok</synonym>
<description>
diff --git a/docs-xml/smbdotconf/security/renameuserscript.xml b/docs-xml/smbdotconf/security/renameuserscript.xml
index 03ade31..472a4a3 100644
--- a/docs-xml/smbdotconf/security/renameuserscript.xml
+++ b/docs-xml/smbdotconf/security/renameuserscript.xml
@@ -1,6 +1,5 @@
<samba:parameter name="rename user script"
context="G"
- advanced="1" developer="1"
type="string"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/restrictanonymous.xml b/docs-xml/smbdotconf/security/restrictanonymous.xml
index 8e2ef08..ffea693 100644
--- a/docs-xml/smbdotconf/security/restrictanonymous.xml
+++ b/docs-xml/smbdotconf/security/restrictanonymous.xml
@@ -1,7 +1,6 @@
<samba:parameter name="restrict anonymous"
type="integer"
context="G"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>The setting of this parameter determines whether user and
diff --git a/docs-xml/smbdotconf/security/rootdirectory.xml b/docs-xml/smbdotconf/security/rootdirectory.xml
index 93a7d59..d5a071e 100644
--- a/docs-xml/smbdotconf/security/rootdirectory.xml
+++ b/docs-xml/smbdotconf/security/rootdirectory.xml
@@ -1,7 +1,6 @@
<samba:parameter name="root directory"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>root</synonym>
<synonym>root dir</synonym>
diff --git a/docs-xml/smbdotconf/security/sambakcccommand.xml b/docs-xml/smbdotconf/security/sambakcccommand.xml
index d990d8f..cf94480 100644
--- a/docs-xml/smbdotconf/security/sambakcccommand.xml
+++ b/docs-xml/smbdotconf/security/sambakcccommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="samba kcc command"
context="G"
type="list"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option specifies the path to the Samba KCC command.
diff --git a/docs-xml/smbdotconf/security/security.xml b/docs-xml/smbdotconf/security/security.xml
index e7e6b32..ac248d0 100644
--- a/docs-xml/smbdotconf/security/security.xml
+++ b/docs-xml/smbdotconf/security/security.xml
@@ -1,7 +1,6 @@
<samba:parameter name="security"
context="G"
type="enum"
- basic="1" advanced="1" wizard="1" developer="1"
function="_security"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<when_value value="security">
diff --git a/docs-xml/smbdotconf/security/serverrole.xml b/docs-xml/smbdotconf/security/serverrole.xml
index cd4b685..e6ff399 100644
--- a/docs-xml/smbdotconf/security/serverrole.xml
+++ b/docs-xml/smbdotconf/security/serverrole.xml
@@ -1,7 +1,6 @@
<samba:parameter name="server role"
context="G"
type="enum"
- basic="1" advanced="1" wizard="1" developer="1"
function="_server_role"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/serverschannel.xml b/docs-xml/smbdotconf/security/serverschannel.xml
index 573e94b..aee63cc 100644
--- a/docs-xml/smbdotconf/security/serverschannel.xml
+++ b/docs-xml/smbdotconf/security/serverschannel.xml
@@ -1,7 +1,6 @@
<samba:parameter name="server schannel"
context="G"
type="enum"
- basic="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/security/serversigning.xml b/docs-xml/smbdotconf/security/serversigning.xml
index c94a3ee..9fdb833 100644
--- a/docs-xml/smbdotconf/security/serversigning.xml
+++ b/docs-xml/smbdotconf/security/serversigning.xml
@@ -1,7 +1,6 @@
<samba:parameter name="server signing"
context="G"
type="enum"
- basic="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/smbencrypt.xml b/docs-xml/smbdotconf/security/smbencrypt.xml
index 14b32c2..17248e6 100644
--- a/docs-xml/smbdotconf/security/smbencrypt.xml
+++ b/docs-xml/smbdotconf/security/smbencrypt.xml
@@ -1,7 +1,6 @@
<samba:parameter name="smb encrypt"
context="S"
type="enum"
- basic="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/security/smbpasswdfile.xml b/docs-xml/smbdotconf/security/smbpasswdfile.xml
index 86701a2..7ca8584 100644
--- a/docs-xml/smbdotconf/security/smbpasswdfile.xml
+++ b/docs-xml/smbdotconf/security/smbpasswdfile.xml
@@ -1,7 +1,6 @@
<samba:parameter name="smb passwd file"
type="string"
context="G"
- advanced="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/tlscafile.xml b/docs-xml/smbdotconf/security/tlscafile.xml
index 889dd23..1498913 100644
--- a/docs-xml/smbdotconf/security/tlscafile.xml
+++ b/docs-xml/smbdotconf/security/tlscafile.xml
@@ -1,7 +1,6 @@
<samba:parameter name="tls cafile"
type="string"
context="G"
- basic="1" advanced="1" developer="1"
function="_tls_cafile"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/security/tlscertfile.xml b/docs-xml/smbdotconf/security/tlscertfile.xml
index df5fb5f..0d06936 100644
--- a/docs-xml/smbdotconf/security/tlscertfile.xml
+++ b/docs-xml/smbdotconf/security/tlscertfile.xml
@@ -1,7 +1,6 @@
<samba:parameter name="tls certfile"
type="string"
context="G"
- basic="1" advanced="1" developer="1"
function="_tls_certfile"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/security/tlscrlfile.xml b/docs-xml/smbdotconf/security/tlscrlfile.xml
index 4c9de35..c0f1cfb 100644
--- a/docs-xml/smbdotconf/security/tlscrlfile.xml
+++ b/docs-xml/smbdotconf/security/tlscrlfile.xml
@@ -1,7 +1,6 @@
<samba:parameter name="tls crlfile"
type="string"
context="G"
- basic="1" advanced="1" developer="1"
function="_tls_crlfile"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/security/tlsdhparamsfile.xml b/docs-xml/smbdotconf/security/tlsdhparamsfile.xml
index b965b1e..7d454f3 100644
--- a/docs-xml/smbdotconf/security/tlsdhparamsfile.xml
+++ b/docs-xml/smbdotconf/security/tlsdhparamsfile.xml
@@ -1,7 +1,6 @@
<samba:parameter name="tls dh params file"
type="string"
context="G"
- basic="1" advanced="1" developer="1"
function="_tls_dhpfile"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/security/tlsenabled.xml b/docs-xml/smbdotconf/security/tlsenabled.xml
index 106ddda..411b928 100644
--- a/docs-xml/smbdotconf/security/tlsenabled.xml
+++ b/docs-xml/smbdotconf/security/tlsenabled.xml
@@ -1,7 +1,6 @@
<samba:parameter name="tls enabled"
type="boolean"
context="G"
- basic="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>If this option is set to <constant>yes</constant>, then Samba
diff --git a/docs-xml/smbdotconf/security/tlskeyfile.xml b/docs-xml/smbdotconf/security/tlskeyfile.xml
index a1c7be3..e6b4a54 100644
--- a/docs-xml/smbdotconf/security/tlskeyfile.xml
+++ b/docs-xml/smbdotconf/security/tlskeyfile.xml
@@ -1,7 +1,6 @@
<samba:parameter name="tls keyfile"
type="string"
context="G"
- basic="1" advanced="1" developer="1"
function="_tls_keyfile"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/security/unixpasswordsync.xml b/docs-xml/smbdotconf/security/unixpasswordsync.xml
index 22971da..d88254b 100644
--- a/docs-xml/smbdotconf/security/unixpasswordsync.xml
+++ b/docs-xml/smbdotconf/security/unixpasswordsync.xml
@@ -1,7 +1,6 @@
<samba:parameter name="unix password sync"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This boolean parameter controls whether Samba
diff --git a/docs-xml/smbdotconf/security/usernamelevel.xml b/docs-xml/smbdotconf/security/usernamelevel.xml
index adb0013..d2cdb5b 100644
--- a/docs-xml/smbdotconf/security/usernamelevel.xml
+++ b/docs-xml/smbdotconf/security/usernamelevel.xml
@@ -1,6 +1,5 @@
<samba:parameter name="username level"
context="G"
- advanced="1" developer="1"
type="integer"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/usernamemap.xml b/docs-xml/smbdotconf/security/usernamemap.xml
index 21098fa..c5a15d0 100644
--- a/docs-xml/smbdotconf/security/usernamemap.xml
+++ b/docs-xml/smbdotconf/security/usernamemap.xml
@@ -1,6 +1,5 @@
<samba:parameter name="username map"
context="G"
- advanced="1" developer="1"
type="string"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/usernamemapcachetime.xml b/docs-xml/smbdotconf/security/usernamemapcachetime.xml
index 4361b18..16aaaaf 100644
--- a/docs-xml/smbdotconf/security/usernamemapcachetime.xml
+++ b/docs-xml/smbdotconf/security/usernamemapcachetime.xml
@@ -1,6 +1,5 @@
<samba:parameter name="username map cache time"
context="G"
- advanced="1" developer="0"
type="integer"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/usernamemapscript.xml b/docs-xml/smbdotconf/security/usernamemapscript.xml
index 9e2e1a5..2e43a78 100644
--- a/docs-xml/smbdotconf/security/usernamemapscript.xml
+++ b/docs-xml/smbdotconf/security/usernamemapscript.xml
@@ -1,7 +1,6 @@
<samba:parameter name="username map script"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This script is a mutually exclusive alternative to the
--
2.1.0
From fd70c60f77463aad5470f11b81c74b67e8197900 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Wed, 29 Apr 2015 00:17:20 +0200
Subject: [PATCH 18/22] docs:smbdotconf: remove swat-specific flags from
tuning/
Signed-off-by: Michael Adam <obnox at samba.org>
---
docs-xml/smbdotconf/tuning/deadtime.xml | 1 -
docs-xml/smbdotconf/tuning/getwdcache.xml | 1 -
docs-xml/smbdotconf/tuning/hostnamelookups.xml | 1 -
docs-xml/smbdotconf/tuning/keepalive.xml | 1 -
docs-xml/smbdotconf/tuning/maxdisksize.xml | 1 -
docs-xml/smbdotconf/tuning/maxopenfiles.xml | 1 -
docs-xml/smbdotconf/tuning/maxsmbdprocesses.xml | 1 -
docs-xml/smbdotconf/tuning/minprintspace.xml | 1 -
docs-xml/smbdotconf/tuning/namecachetimeout.xml | 1 -
docs-xml/smbdotconf/tuning/socketoptions.xml | 1 -
docs-xml/smbdotconf/tuning/usemmap.xml | 1 -
11 files changed, 11 deletions(-)
diff --git a/docs-xml/smbdotconf/tuning/deadtime.xml b/docs-xml/smbdotconf/tuning/deadtime.xml
index 51b76bd..7c60b90 100644
--- a/docs-xml/smbdotconf/tuning/deadtime.xml
+++ b/docs-xml/smbdotconf/tuning/deadtime.xml
@@ -1,6 +1,5 @@
<samba:parameter name="deadtime"
context="G"
- developer="1"
type="integer"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/tuning/getwdcache.xml b/docs-xml/smbdotconf/tuning/getwdcache.xml
index 76e977b..93f7a90 100644
--- a/docs-xml/smbdotconf/tuning/getwdcache.xml
+++ b/docs-xml/smbdotconf/tuning/getwdcache.xml
@@ -1,7 +1,6 @@
<samba:parameter name="getwd cache"
context="G"
type="boolean"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This is a tuning option. When this is enabled a
diff --git a/docs-xml/smbdotconf/tuning/hostnamelookups.xml b/docs-xml/smbdotconf/tuning/hostnamelookups.xml
index 68f4ec4..03678e9 100644
--- a/docs-xml/smbdotconf/tuning/hostnamelookups.xml
+++ b/docs-xml/smbdotconf/tuning/hostnamelookups.xml
@@ -1,7 +1,6 @@
<samba:parameter name="hostname lookups"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Specifies whether samba should use (expensive)
diff --git a/docs-xml/smbdotconf/tuning/keepalive.xml b/docs-xml/smbdotconf/tuning/keepalive.xml
index 5dba4f6..7fbe8cc 100644
--- a/docs-xml/smbdotconf/tuning/keepalive.xml
+++ b/docs-xml/smbdotconf/tuning/keepalive.xml
@@ -1,7 +1,6 @@
<samba:parameter name="keepalive"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>The value of the parameter (an integer) represents
diff --git a/docs-xml/smbdotconf/tuning/maxdisksize.xml b/docs-xml/smbdotconf/tuning/maxdisksize.xml
index ee53105..27d74b9 100644
--- a/docs-xml/smbdotconf/tuning/maxdisksize.xml
+++ b/docs-xml/smbdotconf/tuning/maxdisksize.xml
@@ -1,7 +1,6 @@
<samba:parameter name="max disk size"
context="G"
type="integer"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option allows you to put an upper limit
diff --git a/docs-xml/smbdotconf/tuning/maxopenfiles.xml b/docs-xml/smbdotconf/tuning/maxopenfiles.xml
index 3bdc0c8..f873ef7 100644
--- a/docs-xml/smbdotconf/tuning/maxopenfiles.xml
+++ b/docs-xml/smbdotconf/tuning/maxopenfiles.xml
@@ -1,7 +1,6 @@
<samba:parameter name="max open files"
type="integer"
context="G"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter limits the maximum number of
diff --git a/docs-xml/smbdotconf/tuning/maxsmbdprocesses.xml b/docs-xml/smbdotconf/tuning/maxsmbdprocesses.xml
index 677d731..a194a26 100644
--- a/docs-xml/smbdotconf/tuning/maxsmbdprocesses.xml
+++ b/docs-xml/smbdotconf/tuning/maxsmbdprocesses.xml
@@ -1,7 +1,6 @@
<samba:parameter name="max smbd processes"
type="integer"
context="G"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter limits the maximum number of <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/tuning/minprintspace.xml b/docs-xml/smbdotconf/tuning/minprintspace.xml
index 706e4a7..b5bba27 100644
--- a/docs-xml/smbdotconf/tuning/minprintspace.xml
+++ b/docs-xml/smbdotconf/tuning/minprintspace.xml
@@ -1,7 +1,6 @@
<samba:parameter name="min print space"
context="S"
type="integer"
- print="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This sets the minimum amount of free disk
diff --git a/docs-xml/smbdotconf/tuning/namecachetimeout.xml b/docs-xml/smbdotconf/tuning/namecachetimeout.xml
index 32ad55f..4d29194 100644
--- a/docs-xml/smbdotconf/tuning/namecachetimeout.xml
+++ b/docs-xml/smbdotconf/tuning/namecachetimeout.xml
@@ -1,7 +1,6 @@
<samba:parameter name="name cache timeout"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Specifies the number of seconds it takes before
diff --git a/docs-xml/smbdotconf/tuning/socketoptions.xml b/docs-xml/smbdotconf/tuning/socketoptions.xml
index 213ff16..d02f323 100644
--- a/docs-xml/smbdotconf/tuning/socketoptions.xml
+++ b/docs-xml/smbdotconf/tuning/socketoptions.xml
@@ -1,7 +1,6 @@
<samba:parameter name="socket options"
context="G"
type="string"
- developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/tuning/usemmap.xml b/docs-xml/smbdotconf/tuning/usemmap.xml
index c23fc35..00c36c7 100644
--- a/docs-xml/smbdotconf/tuning/usemmap.xml
+++ b/docs-xml/smbdotconf/tuning/usemmap.xml
@@ -1,7 +1,6 @@
<samba:parameter name="use mmap"
context="G"
type="boolean"
- developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This global parameter determines if the tdb internals of Samba can
--
2.1.0
From 892538b89f73f7c871254a166d8bf5c8400ddcaf Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Wed, 29 Apr 2015 00:19:12 +0200
Subject: [PATCH 19/22] docs:smbdotconf: remove swat-specific flags from vfs/
Signed-off-by: Michael Adam <obnox at samba.org>
---
docs-xml/smbdotconf/vfs/getquotacommand.xml | 1 -
docs-xml/smbdotconf/vfs/hostmsdfs.xml | 1 -
docs-xml/smbdotconf/vfs/ntvfshandler.xml | 1 -
docs-xml/smbdotconf/vfs/setquotacommand.xml | 1 -
4 files changed, 4 deletions(-)
diff --git a/docs-xml/smbdotconf/vfs/getquotacommand.xml b/docs-xml/smbdotconf/vfs/getquotacommand.xml
index eacd19c..7fcd829 100644
--- a/docs-xml/smbdotconf/vfs/getquotacommand.xml
+++ b/docs-xml/smbdotconf/vfs/getquotacommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="get quota command"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>The <command>get quota command</command> should only be used
diff --git a/docs-xml/smbdotconf/vfs/hostmsdfs.xml b/docs-xml/smbdotconf/vfs/hostmsdfs.xml
index 67f67dc..e61b0f6 100644
--- a/docs-xml/smbdotconf/vfs/hostmsdfs.xml
+++ b/docs-xml/smbdotconf/vfs/hostmsdfs.xml
@@ -1,7 +1,6 @@
<samba:parameter name="host msdfs"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/vfs/ntvfshandler.xml b/docs-xml/smbdotconf/vfs/ntvfshandler.xml
index b7c6d15..af9d7bf 100644
--- a/docs-xml/smbdotconf/vfs/ntvfshandler.xml
+++ b/docs-xml/smbdotconf/vfs/ntvfshandler.xml
@@ -1,7 +1,6 @@
<samba:parameter name="ntvfs handler"
context="S"
type="list"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This specifies the NTVFS handlers for this share.</para>
diff --git a/docs-xml/smbdotconf/vfs/setquotacommand.xml b/docs-xml/smbdotconf/vfs/setquotacommand.xml
index cf62715..2a779d4 100644
--- a/docs-xml/smbdotconf/vfs/setquotacommand.xml
+++ b/docs-xml/smbdotconf/vfs/setquotacommand.xml
@@ -1,7 +1,6 @@
<samba:parameter name="set quota command"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>The <command>set quota command</command> should only be used
--
2.1.0
From d6324f6c71e23ecea08a660eccf961bd02261c4c Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Wed, 29 Apr 2015 00:25:33 +0200
Subject: [PATCH 20/22] docs:smbdotconf: remove swat-specific flags from
winbind/
Signed-off-by: Michael Adam <obnox at samba.org>
---
docs-xml/smbdotconf/winbind/createkrb5conf.xml | 1 -
docs-xml/smbdotconf/winbind/idmapbackend.xml | 1 -
docs-xml/smbdotconf/winbind/idmapcachetime.xml | 1 -
docs-xml/smbdotconf/winbind/idmapconfig.xml | 1 -
docs-xml/smbdotconf/winbind/idmapgid.xml | 1 -
docs-xml/smbdotconf/winbind/idmapnegativecachetime.xml | 1 -
docs-xml/smbdotconf/winbind/idmapuid.xml | 1 -
docs-xml/smbdotconf/winbind/netutralizent4emulation.xml | 1 -
docs-xml/smbdotconf/winbind/rejectmd5servers.xml | 1 -
docs-xml/smbdotconf/winbind/requirestrongkey.xml | 1 -
docs-xml/smbdotconf/winbind/templatehomedir.xml | 1 -
docs-xml/smbdotconf/winbind/templateshell.xml | 1 -
docs-xml/smbdotconf/winbind/winbindcachetime.xml | 1 -
docs-xml/smbdotconf/winbind/winbinddprivilegedsocketdirectory.xml | 1 -
docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml | 1 -
docs-xml/smbdotconf/winbind/winbindenumgroups.xml | 1 -
docs-xml/smbdotconf/winbind/winbindenumusers.xml | 1 -
docs-xml/smbdotconf/winbind/winbindexpandgroups.xml | 1 -
docs-xml/smbdotconf/winbind/winbindmaxclients.xml | 1 -
docs-xml/smbdotconf/winbind/winbindmaxdomainconnections.xml | 1 -
docs-xml/smbdotconf/winbind/winbindnestedgroups.xml | 1 -
docs-xml/smbdotconf/winbind/winbindnormalizenames.xml | 1 -
docs-xml/smbdotconf/winbind/winbindnssinfo.xml | 1 -
docs-xml/smbdotconf/winbind/winbindofflinelogon.xml | 1 -
docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml | 1 -
docs-xml/smbdotconf/winbind/winbindrefreshtickets.xml | 1 -
docs-xml/smbdotconf/winbind/winbindrequesttimeout.xml | 1 -
docs-xml/smbdotconf/winbind/winbindrpconly.xml | 1 -
docs-xml/smbdotconf/winbind/winbindsealedpipes.xml | 1 -
docs-xml/smbdotconf/winbind/winbindseparator.xml | 1 -
docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml | 1 -
docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml | 1 -
32 files changed, 32 deletions(-)
diff --git a/docs-xml/smbdotconf/winbind/createkrb5conf.xml b/docs-xml/smbdotconf/winbind/createkrb5conf.xml
index be38519..bb2d300 100644
--- a/docs-xml/smbdotconf/winbind/createkrb5conf.xml
+++ b/docs-xml/smbdotconf/winbind/createkrb5conf.xml
@@ -1,7 +1,6 @@
<samba:parameter name="create krb5 conf"
context="G"
type="boolean"
- advanced="1" developer="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/winbind/idmapbackend.xml b/docs-xml/smbdotconf/winbind/idmapbackend.xml
index 77de17e..a554741 100644
--- a/docs-xml/smbdotconf/winbind/idmapbackend.xml
+++ b/docs-xml/smbdotconf/winbind/idmapbackend.xml
@@ -1,7 +1,6 @@
<samba:parameter name="idmap backend"
context="G"
type="string"
- advanced="1" developer="1" hide="1"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/winbind/idmapcachetime.xml b/docs-xml/smbdotconf/winbind/idmapcachetime.xml
index 44e87ed..4fe6536 100644
--- a/docs-xml/smbdotconf/winbind/idmapcachetime.xml
+++ b/docs-xml/smbdotconf/winbind/idmapcachetime.xml
@@ -1,7 +1,6 @@
<samba:parameter name="idmap cache time"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies the number of seconds that Winbind's
diff --git a/docs-xml/smbdotconf/winbind/idmapconfig.xml b/docs-xml/smbdotconf/winbind/idmapconfig.xml
index 30925a2..434d379 100644
--- a/docs-xml/smbdotconf/winbind/idmapconfig.xml
+++ b/docs-xml/smbdotconf/winbind/idmapconfig.xml
@@ -1,7 +1,6 @@
<samba:parameter name="idmap config:OPTION"
context="G"
type="string"
- advanced="1" developer="1" hide="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/winbind/idmapgid.xml b/docs-xml/smbdotconf/winbind/idmapgid.xml
index 7f45218..b5652b8 100644
--- a/docs-xml/smbdotconf/winbind/idmapgid.xml
+++ b/docs-xml/smbdotconf/winbind/idmapgid.xml
@@ -1,7 +1,6 @@
<samba:parameter name="idmap gid"
context="G"
type="string"
- advanced="1" developer="1" hide="1"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>winbind gid</synonym>
diff --git a/docs-xml/smbdotconf/winbind/idmapnegativecachetime.xml b/docs-xml/smbdotconf/winbind/idmapnegativecachetime.xml
index 6790938..76f538a 100644
--- a/docs-xml/smbdotconf/winbind/idmapnegativecachetime.xml
+++ b/docs-xml/smbdotconf/winbind/idmapnegativecachetime.xml
@@ -1,7 +1,6 @@
<samba:parameter name="idmap negative cache time"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies the number of seconds that Winbind's
diff --git a/docs-xml/smbdotconf/winbind/idmapuid.xml b/docs-xml/smbdotconf/winbind/idmapuid.xml
index 5a71d3e..f72929c 100644
--- a/docs-xml/smbdotconf/winbind/idmapuid.xml
+++ b/docs-xml/smbdotconf/winbind/idmapuid.xml
@@ -1,7 +1,6 @@
<samba:parameter name="idmap uid"
type="string"
context="G"
- advanced="1" developer="1" hide="1"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>winbind uid</synonym>
diff --git a/docs-xml/smbdotconf/winbind/netutralizent4emulation.xml b/docs-xml/smbdotconf/winbind/netutralizent4emulation.xml
index 8294a90..247822e 100644
--- a/docs-xml/smbdotconf/winbind/netutralizent4emulation.xml
+++ b/docs-xml/smbdotconf/winbind/netutralizent4emulation.xml
@@ -1,7 +1,6 @@
<samba:parameter name="neutralize nt4 emulation"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option controls whether winbindd sends
diff --git a/docs-xml/smbdotconf/winbind/rejectmd5servers.xml b/docs-xml/smbdotconf/winbind/rejectmd5servers.xml
index 18f8bcb..3765629 100644
--- a/docs-xml/smbdotconf/winbind/rejectmd5servers.xml
+++ b/docs-xml/smbdotconf/winbind/rejectmd5servers.xml
@@ -1,7 +1,6 @@
<samba:parameter name="reject md5 servers"
context="G"
type="boolean"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option controls whether winbindd requires support
diff --git a/docs-xml/smbdotconf/winbind/requirestrongkey.xml b/docs-xml/smbdotconf/winbind/requirestrongkey.xml
index de749bb..4db62bf 100644
--- a/docs-xml/smbdotconf/winbind/requirestrongkey.xml
+++ b/docs-xml/smbdotconf/winbind/requirestrongkey.xml
@@ -1,7 +1,6 @@
<samba:parameter name="require strong key"
context="G"
type="boolean"
- advanced="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option controls whether winbindd requires support
diff --git a/docs-xml/smbdotconf/winbind/templatehomedir.xml b/docs-xml/smbdotconf/winbind/templatehomedir.xml
index c289ac9..2afa6b3 100644
--- a/docs-xml/smbdotconf/winbind/templatehomedir.xml
+++ b/docs-xml/smbdotconf/winbind/templatehomedir.xml
@@ -1,6 +1,5 @@
<samba:parameter name="template homedir"
context="G"
- advanced="1" developer="1"
type="string"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/winbind/templateshell.xml b/docs-xml/smbdotconf/winbind/templateshell.xml
index 6837161..0844bdf 100644
--- a/docs-xml/smbdotconf/winbind/templateshell.xml
+++ b/docs-xml/smbdotconf/winbind/templateshell.xml
@@ -1,7 +1,6 @@
<samba:parameter name="template shell"
context="G"
type="string"
- advanced="1" developer="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/winbind/winbindcachetime.xml b/docs-xml/smbdotconf/winbind/winbindcachetime.xml
index 6bdcf0d..3ff8089 100644
--- a/docs-xml/smbdotconf/winbind/winbindcachetime.xml
+++ b/docs-xml/smbdotconf/winbind/winbindcachetime.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind cache time"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies the number of
diff --git a/docs-xml/smbdotconf/winbind/winbinddprivilegedsocketdirectory.xml b/docs-xml/smbdotconf/winbind/winbinddprivilegedsocketdirectory.xml
index feb7828..e8be177 100644
--- a/docs-xml/smbdotconf/winbind/winbinddprivilegedsocketdirectory.xml
+++ b/docs-xml/smbdotconf/winbind/winbinddprivilegedsocketdirectory.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbindd privileged socket directory"
context="G"
type="string"
- advanced="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml b/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml
index b8edef5..9b20fbe 100644
--- a/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml
+++ b/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbindd socket directory"
context="G"
type="string"
- advanced="1"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/winbind/winbindenumgroups.xml b/docs-xml/smbdotconf/winbind/winbindenumgroups.xml
index 74f6fee..4d7b5e6 100644
--- a/docs-xml/smbdotconf/winbind/winbindenumgroups.xml
+++ b/docs-xml/smbdotconf/winbind/winbindenumgroups.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind enum groups"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>On large installations using <citerefentry><refentrytitle>winbindd</refentrytitle>
diff --git a/docs-xml/smbdotconf/winbind/winbindenumusers.xml b/docs-xml/smbdotconf/winbind/winbindenumusers.xml
index 4054703..5ce53d6 100644
--- a/docs-xml/smbdotconf/winbind/winbindenumusers.xml
+++ b/docs-xml/smbdotconf/winbind/winbindenumusers.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind enum users"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>On large installations using <citerefentry><refentrytitle>winbindd</refentrytitle>
diff --git a/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml b/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml
index 57077b3..73c1464 100644
--- a/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml
+++ b/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind expand groups"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option controls the maximum depth that winbindd
diff --git a/docs-xml/smbdotconf/winbind/winbindmaxclients.xml b/docs-xml/smbdotconf/winbind/winbindmaxclients.xml
index ae49e45..d37ee25 100644
--- a/docs-xml/smbdotconf/winbind/winbindmaxclients.xml
+++ b/docs-xml/smbdotconf/winbind/winbindmaxclients.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind max clients"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies the maximum number of clients
diff --git a/docs-xml/smbdotconf/winbind/winbindmaxdomainconnections.xml b/docs-xml/smbdotconf/winbind/winbindmaxdomainconnections.xml
index e492517..c279244 100644
--- a/docs-xml/smbdotconf/winbind/winbindmaxdomainconnections.xml
+++ b/docs-xml/smbdotconf/winbind/winbindmaxdomainconnections.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind max domain connections"
context="G"
type="integer"
- advanced="1" developer="1"
generated_function="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/winbind/winbindnestedgroups.xml b/docs-xml/smbdotconf/winbind/winbindnestedgroups.xml
index 01e95bb..8a8bc54 100644
--- a/docs-xml/smbdotconf/winbind/winbindnestedgroups.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnestedgroups.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind nested groups"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>If set to yes, this parameter activates the support for nested
diff --git a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
index 28bd34c..8339cbf 100644
--- a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind normalize names"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter controls whether winbindd will replace
diff --git a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
index fa88416..6b09be0 100644
--- a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind nss info"
context="G"
type="list"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/winbind/winbindofflinelogon.xml b/docs-xml/smbdotconf/winbind/winbindofflinelogon.xml
index e482a11..1a5b522 100644
--- a/docs-xml/smbdotconf/winbind/winbindofflinelogon.xml
+++ b/docs-xml/smbdotconf/winbind/winbindofflinelogon.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind offline logon"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml b/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml
index 2da263e..11d105c 100644
--- a/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml
+++ b/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind reconnect delay"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies the number of
diff --git a/docs-xml/smbdotconf/winbind/winbindrefreshtickets.xml b/docs-xml/smbdotconf/winbind/winbindrefreshtickets.xml
index 9280396..00c65df 100644
--- a/docs-xml/smbdotconf/winbind/winbindrefreshtickets.xml
+++ b/docs-xml/smbdotconf/winbind/winbindrefreshtickets.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind refresh tickets"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/winbind/winbindrequesttimeout.xml b/docs-xml/smbdotconf/winbind/winbindrequesttimeout.xml
index 3220871..d6c9e08 100644
--- a/docs-xml/smbdotconf/winbind/winbindrequesttimeout.xml
+++ b/docs-xml/smbdotconf/winbind/winbindrequesttimeout.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind request timeout"
context="G"
type="integer"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies the number of
diff --git a/docs-xml/smbdotconf/winbind/winbindrpconly.xml b/docs-xml/smbdotconf/winbind/winbindrpconly.xml
index 71ac379..3019e71 100644
--- a/docs-xml/smbdotconf/winbind/winbindrpconly.xml
+++ b/docs-xml/smbdotconf/winbind/winbindrpconly.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind rpc only"
context="G"
type="boolean"
- advanced="1" developer="0"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/winbind/winbindsealedpipes.xml b/docs-xml/smbdotconf/winbind/winbindsealedpipes.xml
index 63f5588..016ac9b 100644
--- a/docs-xml/smbdotconf/winbind/winbindsealedpipes.xml
+++ b/docs-xml/smbdotconf/winbind/winbindsealedpipes.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind sealed pipes"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option controls whether any requests from winbindd to domain controllers
diff --git a/docs-xml/smbdotconf/winbind/winbindseparator.xml b/docs-xml/smbdotconf/winbind/winbindseparator.xml
index e4995a8..8c4a11a 100644
--- a/docs-xml/smbdotconf/winbind/winbindseparator.xml
+++ b/docs-xml/smbdotconf/winbind/winbindseparator.xml
@@ -1,6 +1,5 @@
<samba:parameter name="winbind separator"
context="G"
- advanced="1" developer="1"
type="string"
constant="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml b/docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml
index 3b1896f..629832c 100644
--- a/docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml
+++ b/docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind trusted domains only"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml b/docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml
index c7e7600..8278aa5 100644
--- a/docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml
+++ b/docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml
@@ -1,7 +1,6 @@
<samba:parameter name="winbind use default domain"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter specifies whether the
--
2.1.0
From 15096ec96d66b84e7abd6ae75415c046b93f7024 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Wed, 29 Apr 2015 00:26:48 +0200
Subject: [PATCH 21/22] docs:smbdotconf: remove swat-specific flags from wins/
Signed-off-by: Michael Adam <obnox at samba.org>
---
docs-xml/smbdotconf/wins/dnsproxy.xml | 1 -
docs-xml/smbdotconf/wins/winshook.xml | 1 -
docs-xml/smbdotconf/wins/winsproxy.xml | 1 -
docs-xml/smbdotconf/wins/winsserver.xml | 1 -
docs-xml/smbdotconf/wins/winssupport.xml | 1 -
5 files changed, 5 deletions(-)
diff --git a/docs-xml/smbdotconf/wins/dnsproxy.xml b/docs-xml/smbdotconf/wins/dnsproxy.xml
index b367c44..6b3c198 100644
--- a/docs-xml/smbdotconf/wins/dnsproxy.xml
+++ b/docs-xml/smbdotconf/wins/dnsproxy.xml
@@ -1,7 +1,6 @@
<samba:parameter name="dns proxy"
context="G"
type="boolean"
- advanced="1" developer="1"
function="wins_dns_proxy"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/wins/winshook.xml b/docs-xml/smbdotconf/wins/winshook.xml
index 9e41fbd..748e8b8 100644
--- a/docs-xml/smbdotconf/wins/winshook.xml
+++ b/docs-xml/smbdotconf/wins/winshook.xml
@@ -1,7 +1,6 @@
<samba:parameter name="wins hook"
context="G"
type="string"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>When Samba is running as a WINS server this
diff --git a/docs-xml/smbdotconf/wins/winsproxy.xml b/docs-xml/smbdotconf/wins/winsproxy.xml
index 8f98687..d240c21 100644
--- a/docs-xml/smbdotconf/wins/winsproxy.xml
+++ b/docs-xml/smbdotconf/wins/winsproxy.xml
@@ -1,7 +1,6 @@
<samba:parameter name="wins proxy"
context="G"
type="boolean"
- advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This is a boolean that controls if <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/wins/winsserver.xml b/docs-xml/smbdotconf/wins/winsserver.xml
index 40e668f..69146fb 100644
--- a/docs-xml/smbdotconf/wins/winsserver.xml
+++ b/docs-xml/smbdotconf/wins/winsserver.xml
@@ -1,7 +1,6 @@
<samba:parameter name="wins server"
context="G"
type="list"
- basic="1" advanced="1" wizard="1" developer="1"
function="wins_server_list"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/wins/winssupport.xml b/docs-xml/smbdotconf/wins/winssupport.xml
index 6bc3765..c1c7fed 100644
--- a/docs-xml/smbdotconf/wins/winssupport.xml
+++ b/docs-xml/smbdotconf/wins/winssupport.xml
@@ -1,7 +1,6 @@
<samba:parameter name="wins support"
type="boolean"
context="G"
- basic="1" advanced="1" wizard="1" developer="1"
function="we_are_a_wins_server"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
--
2.1.0
From ea5fa3f59df8d6f7d3108ab44cd862711516c6e5 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Wed, 29 Apr 2015 01:15:05 +0200
Subject: [PATCH 22/22] docs-xml: remove swat specific flags from the DTD
Signed-off-by: Michael Adam <obnox at samba.org>
---
docs-xml/build/DTD/samba-doc | 5 -----
1 file changed, 5 deletions(-)
diff --git a/docs-xml/build/DTD/samba-doc b/docs-xml/build/DTD/samba-doc
index 8de9729..06aa02a 100644
--- a/docs-xml/build/DTD/samba-doc
+++ b/docs-xml/build/DTD/samba-doc
@@ -42,11 +42,6 @@
name CDATA #REQUIRED
type CDATA #REQUIRED
context CDATA #REQUIRED
- advanced CDATA #IMPLIED
- developer CDATA #IMPLIED
- wizard CDATA #IMPLIED
- basic CDATA #IMPLIED
- print CDATA #IMPLIED
>
<!ELEMENT description ANY>
<!ELEMENT synonym (#PCDATA)>
--
2.1.0
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150429/993b7645/attachment-0001.pgp>
More information about the samba-technical
mailing list