[PART3] [PATCHES] some cleanup to loadparm

Michael Adam obnox at samba.org
Fri Jul 24 00:02:30 UTC 2015


Update on part3:
I forgot a patch to update the docs test with
knowledge about the new types.
(didn't notice before sending the patches because
I had a patch on top that only ran one of the tests...;)

Here is the updated patchset that incorporates this
additional patch.

The other patches remain unchanged.

Thanks for considering - Michael


On 2015-07-23 at 21:00 +0200, Michael Adam wrote:
> Attached is, on top of the two previous patchsets,
> the third patchset.
> 
> It contains the final set of consolidations and
> systematizations, needed to correctly generate
> the param table.
> 
> The changes basically add needed attributes to
> the metadata in the docs and fill/correct some
> settings in the param_table, so that my generated
> param_table is identical to the committed one.
> 
> Review appreciated!
> 
> The next (and last) set of patches will be
> the genration of the param_table.
> 
> Cheers - Michael
> 
-------------- next part --------------
From 6bc37fe234aca8e79b0df26ec4c5c244d020eefe Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 23 Jul 2015 13:59:26 +0200
Subject: [PATCH 01/13] param: add SYNONYM flag where missing

thereby remove DEPRECATED flags: synonyms currently
only carry the syn flag. Other flags sit on the primary
entry.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 lib/param/param_table.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index c7eee9a..cfabe5c 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -798,6 +798,7 @@ struct parm_struct parm_table[] = {
 		.offset		= LOCAL_VAR(force_group),
 		.special	= NULL,
 		.enum_list	= NULL,
+		.flags		= FLAG_SYNONYM,
 	},
 	{
 		.label		= "read only",
@@ -916,6 +917,7 @@ struct parm_struct parm_table[] = {
 		.offset		= LOCAL_VAR(directory_mask),
 		.special	= NULL,
 		.enum_list	= NULL,
+		.flags		= FLAG_SYNONYM,
 	},
 	{
 		.label		= "force directory mode",
@@ -1261,6 +1263,7 @@ struct parm_struct parm_table[] = {
 		.offset		= GLOBAL_VAR(server_max_protocol),
 		.special	= NULL,
 		.enum_list	= enum_protocol,
+		.flags		= FLAG_SYNONYM,
 	},
 	{
 		.label		= "protocol",
@@ -1269,6 +1272,7 @@ struct parm_struct parm_table[] = {
 		.offset		= GLOBAL_VAR(server_max_protocol),
 		.special	= NULL,
 		.enum_list	= enum_protocol,
+		.flags		= FLAG_SYNONYM,
 	},
 	{
 		.label		= "server min protocol",
@@ -1285,6 +1289,7 @@ struct parm_struct parm_table[] = {
 		.offset		= GLOBAL_VAR(server_min_protocol),
 		.special	= NULL,
 		.enum_list	= enum_protocol,
+		.flags		= FLAG_SYNONYM,
 	},
 	{
 		.label		= "client max protocol",
@@ -2998,6 +3003,7 @@ struct parm_struct parm_table[] = {
 		.offset		= GLOBAL_VAR(auto_services),
 		.special	= NULL,
 		.enum_list	= NULL,
+		.flags		= FLAG_SYNONYM,
 	},
 	{
 		.label		= "auto services",
@@ -3098,6 +3104,7 @@ struct parm_struct parm_table[] = {
 		.offset		= GLOBAL_VAR(defaultservice),
 		.special	= NULL,
 		.enum_list	= NULL,
+		.flags		= FLAG_SYNONYM,
 	},
 	{
 		.label		= "message command",
@@ -3171,7 +3178,7 @@ struct parm_struct parm_table[] = {
 		.offset		= GLOBAL_VAR(nbt_client_socket_address),
 		.special	= NULL,
 		.enum_list	= NULL,
-		.flags		= FLAG_DEPRECATED,
+		.flags		= FLAG_SYNONYM,
 	},
 	{
 		.label		= "nmbd bind explicit broadcast",
@@ -3262,6 +3269,7 @@ struct parm_struct parm_table[] = {
 		.offset		= LOCAL_VAR(preexec),
 		.special	= NULL,
 		.enum_list	= NULL,
+		.flags		= FLAG_SYNONYM,
 	},
 	{
 		.label		= "preexec close",
-- 
2.4.3


From 54b7e7bcaca483ad0b9389029e811c6f43cc6008 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 23 Jul 2015 16:42:48 +0200
Subject: [PATCH 02/13] param: make 'timestamp logs' the default writing of
 'debug timestamp'

This is how it used internally.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 .../smbdotconf/logging/{debugtimestamp.xml => timestamplogs.xml}     | 5 ++---
 lib/param/param_table.c                                              | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename docs-xml/smbdotconf/logging/{debugtimestamp.xml => timestamplogs.xml} (79%)

diff --git a/docs-xml/smbdotconf/logging/debugtimestamp.xml b/docs-xml/smbdotconf/logging/timestamplogs.xml
similarity index 79%
rename from docs-xml/smbdotconf/logging/debugtimestamp.xml
rename to docs-xml/smbdotconf/logging/timestamplogs.xml
index 87c88ca..efe55c4 100644
--- a/docs-xml/smbdotconf/logging/debugtimestamp.xml
+++ b/docs-xml/smbdotconf/logging/timestamplogs.xml
@@ -1,9 +1,8 @@
-<samba:parameter name="debug timestamp"
+<samba:parameter name="timestamp logs"
                  context="G"
                  type="boolean"
-                 function="timestamp_logs"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<synonym>timestamp logs</synonym>
+<synonym>debug timestamp</synonym>
 <description>
     <para>
     Samba debug log messages are timestamped by default. If you are running at a high 
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index cfabe5c..cd66c1d 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -1143,6 +1143,7 @@ struct parm_struct parm_table[] = {
 		.offset		= GLOBAL_VAR(timestamp_logs),
 		.special	= NULL,
 		.enum_list	= NULL,
+		.flags		= FLAG_SYNONYM,
 	},
 	{
 		.label		= "timestamp logs",
-- 
2.4.3


From 2152bf30a6347afab71de73f51cbb966b5fd6504 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 23 Jul 2015 16:51:59 +0200
Subject: [PATCH 03/13] param: don't list '-valid' and 'copy' as synonyms -
 they aren't

Signed-off-by: Michael Adam <obnox at samba.org>
---
 lib/param/param_table.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index cd66c1d..cefc6ce 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3236,7 +3236,6 @@ struct parm_struct parm_table[] = {
 		.offset		= LOCAL_VAR(valid),
 		.special	= NULL,
 		.enum_list	= NULL,
-		.flags		= FLAG_SYNONYM,
 	},
 	{
 		.label		= "copy",
@@ -3245,7 +3244,6 @@ struct parm_struct parm_table[] = {
 		.offset		= LOCAL_VAR(copy),
 		.special	= handle_copy,
 		.enum_list	= NULL,
-		.flags		= FLAG_SYNONYM,
 	},
 	{
 		.label		= "include",
-- 
2.4.3


From 0798da5b48ecf1640388b9dc0ec060685ec0d11e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 23 Jul 2015 20:45:07 +0200
Subject: [PATCH 04/13] docs:smbdotconf: 'write ok' is a synonym of 'writeable'
 not of 'read only'

(It is a reverse synonym of 'read only'...)

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/smbdotconf/security/readonly.xml  | 1 -
 docs-xml/smbdotconf/security/writeable.xml | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs-xml/smbdotconf/security/readonly.xml b/docs-xml/smbdotconf/security/readonly.xml
index b6fdda6..834633f 100644
--- a/docs-xml/smbdotconf/security/readonly.xml
+++ b/docs-xml/smbdotconf/security/readonly.xml
@@ -2,7 +2,6 @@
                  context="S"
                  type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<synonym>write ok</synonym>
 <description>
     <para>An inverted synonym is <smbconfoption name="writeable"/>.</para>
 
diff --git a/docs-xml/smbdotconf/security/writeable.xml b/docs-xml/smbdotconf/security/writeable.xml
index 14a5a02..5433849 100644
--- a/docs-xml/smbdotconf/security/writeable.xml
+++ b/docs-xml/smbdotconf/security/writeable.xml
@@ -5,6 +5,7 @@
                  synonym="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>writable</synonym>
+<synonym>write ok</synonym>
 <description>
     <para>Inverted synonym for <smbconfoption name="read only"/>.</para>
 </description>
-- 
2.4.3


From f4168429bd992ff59813b6fb11dfe2b61d774adc Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 23 Jul 2015 14:39:27 +0200
Subject: [PATCH 05/13] docs:smbdotconf: make preload a synonym of 'auto
 services'

It is this way around in internal data structures.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/smbdotconf/misc/{preload.xml => auto_services.xml} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename docs-xml/smbdotconf/misc/{preload.xml => auto_services.xml} (85%)

diff --git a/docs-xml/smbdotconf/misc/preload.xml b/docs-xml/smbdotconf/misc/auto_services.xml
similarity index 85%
rename from docs-xml/smbdotconf/misc/preload.xml
rename to docs-xml/smbdotconf/misc/auto_services.xml
index d535ed2..f2540f5 100644
--- a/docs-xml/smbdotconf/misc/preload.xml
+++ b/docs-xml/smbdotconf/misc/auto_services.xml
@@ -1,9 +1,8 @@
-<samba:parameter name="preload"
+<samba:parameter name="auto services"
                  context="G"
                  type="string"
-                 function="auto_services"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<synonym>auto services</synonym>
+<synonym>preload</synonym>
 <description>
 	<para>This is a list of services that you want to be 
 	automatically added to the browse lists. This is most useful 
-- 
2.4.3


From 96bff02bcaa806caa47702444f8da6545f27b030 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 23 Jul 2015 16:24:34 +0200
Subject: [PATCH 06/13] docs:smbdotconf: add deprecated flags where missing.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/smbdotconf/logging/syslog.xml                    | 1 +
 docs-xml/smbdotconf/logging/syslogonly.xml                | 1 +
 docs-xml/smbdotconf/logon/enableprivileges.xml            | 3 ++-
 docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml       | 1 +
 docs-xml/smbdotconf/protocol/aclcheckpermissions.xml      | 1 +
 docs-xml/smbdotconf/protocol/usespnego.xml                | 1 +
 docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml | 1 +
 docs-xml/smbdotconf/security/nullpasswords.xml            | 1 +
 docs-xml/smbdotconf/security/onlyuser.xml                 | 1 +
 docs-xml/smbdotconf/security/username.xml                 | 1 +
 docs-xml/smbdotconf/winbind/idmapbackend.xml              | 1 +
 docs-xml/smbdotconf/winbind/idmapgid.xml                  | 1 +
 docs-xml/smbdotconf/winbind/idmapuid.xml                  | 1 +
 13 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs-xml/smbdotconf/logging/syslog.xml b/docs-xml/smbdotconf/logging/syslog.xml
index 03dc02e..78e694e 100644
--- a/docs-xml/smbdotconf/logging/syslog.xml
+++ b/docs-xml/smbdotconf/logging/syslog.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="syslog"
                  context="G"
                  type="integer"
+                 deprecated="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 7c65daa..b9aea2d 100644
--- a/docs-xml/smbdotconf/logging/syslogonly.xml
+++ b/docs-xml/smbdotconf/logging/syslogonly.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="syslog only"
                  context="G"
                  type="boolean"
+                 deprecated="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/logon/enableprivileges.xml b/docs-xml/smbdotconf/logon/enableprivileges.xml
index be9b5f7..9e28457 100644
--- a/docs-xml/smbdotconf/logon/enableprivileges.xml
+++ b/docs-xml/smbdotconf/logon/enableprivileges.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="enable privileges"
                  context="G"
-		 type="boolean"
+                 type="boolean"
+                 deprecated="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml b/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
index 1049d9b..0833c63 100644
--- a/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
+++ b/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
@@ -2,6 +2,7 @@
                  context="G"
                  type="string"
                  constant="1"
+                 deprecated="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>socket address</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml b/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
index 667455a..bfffcc0 100644
--- a/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
+++ b/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="acl check permissions"
                  context="S"
                  type="boolean"
+                 deprecated="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/usespnego.xml b/docs-xml/smbdotconf/protocol/usespnego.xml
index aee75f3..0c9ffbf 100644
--- a/docs-xml/smbdotconf/protocol/usespnego.xml
+++ b/docs-xml/smbdotconf/protocol/usespnego.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="use spnego"
                  context="G"
                  type="boolean"
+                 deprecated="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/security/clientusepsnegoprincipal.xml b/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml
index c067f35..8e9edd2 100644
--- a/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml
+++ b/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="client use spnego principal"
                  context="G"
                  type="boolean"
+                 deprecated="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/nullpasswords.xml b/docs-xml/smbdotconf/security/nullpasswords.xml
index 36f66c2..49533f6 100644
--- a/docs-xml/smbdotconf/security/nullpasswords.xml
+++ b/docs-xml/smbdotconf/security/nullpasswords.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="null passwords"
                  context="G"
                  type="boolean"
+                 deprecated="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>Allow or disallow client access to accounts that have null passwords. </para>
diff --git a/docs-xml/smbdotconf/security/onlyuser.xml b/docs-xml/smbdotconf/security/onlyuser.xml
index c18608e..3b62ba6 100644
--- a/docs-xml/smbdotconf/security/onlyuser.xml
+++ b/docs-xml/smbdotconf/security/onlyuser.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="only user"
                  type="boolean"
                  context="S"
+                 deprecated="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>To restrict a service to a particular set of users you
diff --git a/docs-xml/smbdotconf/security/username.xml b/docs-xml/smbdotconf/security/username.xml
index ec064bd..a04a997 100644
--- a/docs-xml/smbdotconf/security/username.xml
+++ b/docs-xml/smbdotconf/security/username.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="username"
                  context="S"
                  type="string"
+                 deprecated="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>user</synonym>
 <synonym>users</synonym>
diff --git a/docs-xml/smbdotconf/winbind/idmapbackend.xml b/docs-xml/smbdotconf/winbind/idmapbackend.xml
index 410be8e..864a975 100644
--- a/docs-xml/smbdotconf/winbind/idmapbackend.xml
+++ b/docs-xml/smbdotconf/winbind/idmapbackend.xml
@@ -3,6 +3,7 @@
                  type="string"
                  generated_function="0"
                  handler="handle_idmap_backend"
+                 deprecated="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/winbind/idmapgid.xml b/docs-xml/smbdotconf/winbind/idmapgid.xml
index 62dcd58..1b576b2 100644
--- a/docs-xml/smbdotconf/winbind/idmapgid.xml
+++ b/docs-xml/smbdotconf/winbind/idmapgid.xml
@@ -3,6 +3,7 @@
                  type="string"
                  generated_function="0"
                  handler="handle_idmap_gid"
+                 deprecated="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>winbind gid</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/winbind/idmapuid.xml b/docs-xml/smbdotconf/winbind/idmapuid.xml
index 1e7bc35..f666f61 100644
--- a/docs-xml/smbdotconf/winbind/idmapuid.xml
+++ b/docs-xml/smbdotconf/winbind/idmapuid.xml
@@ -3,6 +3,7 @@
                  context="G"
                  generated_function="0"
                  handler="handle_idmap_uid"
+                 deprecated="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>winbind uid</synonym>
 <description>
-- 
2.4.3


From 88c113800f70345e4babb11e9531503c5f07807f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 23 Jul 2015 18:00:41 +0200
Subject: [PATCH 07/13] generate_param: more uniform formatting of various type
 dicts

This allows for easier extension later on (patch context-wise).

Signed-off-by: Michael Adam <obnox at samba.org>
---
 script/generate_param.py | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/script/generate_param.py b/script/generate_param.py
index 351ea6b..494e239 100644
--- a/script/generate_param.py
+++ b/script/generate_param.py
@@ -89,9 +89,15 @@ def iterate_all(path):
 
 # map doc attributes to a section of the generated function
 context_dict = {"G": "_GLOBAL", "S": "_LOCAL"}
-param_type_dict = {"boolean": "_BOOL", "list": "_LIST", "string": "_STRING",
-                   "integer": "_INTEGER", "enum": "_INTEGER", "char" : "_CHAR",
-                   "boolean-auto": "_INTEGER"}
+param_type_dict = {
+                    "boolean"      : "_BOOL",
+                    "list"         : "_LIST",
+                    "string"       : "_STRING",
+                    "integer"      : "_INTEGER",
+                    "enum"         : "_INTEGER",
+                    "char"         : "_CHAR",
+                    "boolean-auto" : "_INTEGER",
+                  }
 
 def generate_functions(path_in, path_out):
     f = open(path_out, 'w')
@@ -123,8 +129,15 @@ def generate_functions(path_in, path_out):
     finally:
         f.close()
 
-mapping = {'boolean': 'bool ', 'string': 'char *', 'integer': 'int ', 'char': 'char ',
-           'list': 'const char **', 'enum': 'int ', 'boolean-auto': 'int '}
+mapping = {
+            'boolean'      : 'bool ',
+            'string'       : 'char *',
+            'integer'      : 'int ',
+            'char'         : 'char ',
+            'list'         : 'const char **',
+            'enum'         : 'int ',
+            'boolean-auto' : 'int ',
+          }
 
 def make_s3_param_proto(path_in, path_out):
     file_out = open(path_out, 'w')
-- 
2.4.3


From c4423df12bbf0f7c55179214996d95b1a482d3ee Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 23 Jul 2015 18:01:40 +0200
Subject: [PATCH 08/13] generate_param: teach missing types cmdlist, bytes,
 octal, ustring.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 script/generate_param.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/script/generate_param.py b/script/generate_param.py
index 494e239..b71d3aa 100644
--- a/script/generate_param.py
+++ b/script/generate_param.py
@@ -97,6 +97,10 @@ param_type_dict = {
                     "enum"         : "_INTEGER",
                     "char"         : "_CHAR",
                     "boolean-auto" : "_INTEGER",
+                    "cmdlist"      : "_LIST",
+                    "bytes"        : "_INTEGER",
+                    "octal"        : "_INTEGER",
+                    "ustring"      : "_STRING",
                   }
 
 def generate_functions(path_in, path_out):
@@ -137,6 +141,10 @@ mapping = {
             'list'         : 'const char **',
             'enum'         : 'int ',
             'boolean-auto' : 'int ',
+            'cmdlist'      : 'const char **',
+            'bytes'        : 'int ',
+            'octal'        : 'int ',
+            'ustring'      : 'char *',
           }
 
 def make_s3_param_proto(path_in, path_out):
-- 
2.4.3


From 4a8fa048b28d63d13ae383a7c6ed58ead51ccc91 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Fri, 24 Jul 2015 01:28:56 +0200
Subject: [PATCH 09/13] tests:docs: teach the test the types cmdlist, bytes,
 octal, and ustring

Signed-off-by: Michael Adam <obnox at samba.org>
---
 python/samba/tests/docs.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/python/samba/tests/docs.py b/python/samba/tests/docs.py
index 4261e78..112f89a 100644
--- a/python/samba/tests/docs.py
+++ b/python/samba/tests/docs.py
@@ -274,9 +274,17 @@ class SmbDotConfTests(TestCase):
     def _set_arbitrary(self, program, exceptions=None):
         arbitrary = {'string': 'string', 'boolean': 'yes', 'integer': '5',
                      'boolean-rev': 'yes',
+                     'cmdlist': 'a b c',
+                     'bytes': '10',
+                     'octal': '0123',
+                     'ustring': 'ustring',
                      'enum':'', 'boolean-auto': '', 'char': 'a', 'list': 'a, b, c'}
         opposite_arbitrary = {'string': 'string2', 'boolean': 'no', 'integer': '6',
                               'boolean-rev': 'no',
+                              'cmdlist': 'd e f',
+                              'bytes': '11',
+                              'octal': '0567',
+                              'ustring': 'ustring2',
                               'enum':'', 'boolean-auto': '', 'char': 'b', 'list': 'd, e, f'}
         topdir = os.path.abspath(samba.source_tree_topdir())
         try:
-- 
2.4.3


From 5ccf5eb5327c3ee1939cc3deb2c208cef165a81f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 23 Jul 2015 17:19:19 +0200
Subject: [PATCH 10/13] docs:smbdotconf: change type to cmdlist where needed.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/smbdotconf/base/interfaces.xml               | 2 +-
 docs-xml/smbdotconf/base/netbiosaliases.xml           | 2 +-
 docs-xml/smbdotconf/domain/dnsupdatecommand.xml       | 2 +-
 docs-xml/smbdotconf/domain/nsupdatecommand.xml        | 2 +-
 docs-xml/smbdotconf/domain/rndccommand.xml            | 2 +-
 docs-xml/smbdotconf/domain/spnupdatecommand.xml       | 2 +-
 docs-xml/smbdotconf/logon/initlogondelayedhosts.xml   | 2 +-
 docs-xml/smbdotconf/misc/clusteraddresses.xml         | 2 +-
 docs-xml/smbdotconf/misc/usershareprefixallowlist.xml | 2 +-
 docs-xml/smbdotconf/misc/usershareprefixdenylist.xml  | 2 +-
 docs-xml/smbdotconf/protocol/eventloglist.xml         | 2 +-
 docs-xml/smbdotconf/protocol/nameresolveorder.xml     | 2 +-
 docs-xml/smbdotconf/protocol/smbports.xml             | 2 +-
 docs-xml/smbdotconf/protocol/svcctllist.xml           | 2 +-
 docs-xml/smbdotconf/security/adminusers.xml           | 2 +-
 docs-xml/smbdotconf/security/authmethods.xml          | 2 +-
 docs-xml/smbdotconf/security/hostsallow.xml           | 2 +-
 docs-xml/smbdotconf/security/hostsdeny.xml            | 2 +-
 docs-xml/smbdotconf/security/invalidusers.xml         | 2 +-
 docs-xml/smbdotconf/security/preloadmodules.xml       | 2 +-
 docs-xml/smbdotconf/security/readlist.xml             | 2 +-
 docs-xml/smbdotconf/security/sambakcccommand.xml      | 2 +-
 docs-xml/smbdotconf/security/validusers.xml           | 2 +-
 docs-xml/smbdotconf/security/writelist.xml            | 2 +-
 docs-xml/smbdotconf/vfs/vfsobjects.xml                | 2 +-
 docs-xml/smbdotconf/winbind/winbindnssinfo.xml        | 2 +-
 docs-xml/smbdotconf/wins/winsserver.xml               | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/docs-xml/smbdotconf/base/interfaces.xml b/docs-xml/smbdotconf/base/interfaces.xml
index ba36cc4..db12fa1 100644
--- a/docs-xml/smbdotconf/base/interfaces.xml
+++ b/docs-xml/smbdotconf/base/interfaces.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="interfaces"
                  context="G"
-                 type="list"
+                 type="cmdlist"
                  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/netbiosaliases.xml b/docs-xml/smbdotconf/base/netbiosaliases.xml
index 089cff8..0304ab0 100644
--- a/docs-xml/smbdotconf/base/netbiosaliases.xml
+++ b/docs-xml/smbdotconf/base/netbiosaliases.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="netbios aliases"
                  context="G"
-                 type="list"
+                 type="cmdlist"
                  handler="handle_netbios_aliases"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
diff --git a/docs-xml/smbdotconf/domain/dnsupdatecommand.xml b/docs-xml/smbdotconf/domain/dnsupdatecommand.xml
index 70c311e..40cbc5b 100644
--- a/docs-xml/smbdotconf/domain/dnsupdatecommand.xml
+++ b/docs-xml/smbdotconf/domain/dnsupdatecommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="dns update command"
                  context="G"
-                 type="list"
+                 type="cmdlist"
                  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/nsupdatecommand.xml b/docs-xml/smbdotconf/domain/nsupdatecommand.xml
index 9481058..8978ade 100644
--- a/docs-xml/smbdotconf/domain/nsupdatecommand.xml
+++ b/docs-xml/smbdotconf/domain/nsupdatecommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="nsupdate command"
                  context="G"
-                 type="list"
+                 type="cmdlist"
                  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 72df82f..d9ac4ea 100644
--- a/docs-xml/smbdotconf/domain/rndccommand.xml
+++ b/docs-xml/smbdotconf/domain/rndccommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="rndc command"
                  context="G"
-                 type="list"
+                 type="cmdlist"
                  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 cbeb657..9dcce13 100644
--- a/docs-xml/smbdotconf/domain/spnupdatecommand.xml
+++ b/docs-xml/smbdotconf/domain/spnupdatecommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="spn update command"
                  context="G"
-                 type="list"
+                 type="cmdlist"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option sets the command that for updating
diff --git a/docs-xml/smbdotconf/logon/initlogondelayedhosts.xml b/docs-xml/smbdotconf/logon/initlogondelayedhosts.xml
index 12d91cc..83d1ebd 100644
--- a/docs-xml/smbdotconf/logon/initlogondelayedhosts.xml
+++ b/docs-xml/smbdotconf/logon/initlogondelayedhosts.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="init logon delayed hosts"
                  context="G"
-		 type="list"
+                 type="cmdlist"
                  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 b1116d3..d01a4f9 100644
--- a/docs-xml/smbdotconf/misc/clusteraddresses.xml
+++ b/docs-xml/smbdotconf/misc/clusteraddresses.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="cluster addresses"
                  context="G"
-                 type="list"
+                 type="cmdlist"
                  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/usershareprefixallowlist.xml b/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
index 50ea168..4c236fe 100644
--- a/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
+++ b/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="usershare prefix allow list"
                  context="G"
-                 type="list"
+                 type="cmdlist"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies a list of absolute pathnames
diff --git a/docs-xml/smbdotconf/misc/usershareprefixdenylist.xml b/docs-xml/smbdotconf/misc/usershareprefixdenylist.xml
index 85e17ff..c0e18a7 100644
--- a/docs-xml/smbdotconf/misc/usershareprefixdenylist.xml
+++ b/docs-xml/smbdotconf/misc/usershareprefixdenylist.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="usershare prefix deny list"
                  context="G"
-                 type="list"
+                 type="cmdlist"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies a list of absolute pathnames
diff --git a/docs-xml/smbdotconf/protocol/eventloglist.xml b/docs-xml/smbdotconf/protocol/eventloglist.xml
index 7429f03..6d0b400 100644
--- a/docs-xml/smbdotconf/protocol/eventloglist.xml
+++ b/docs-xml/smbdotconf/protocol/eventloglist.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="eventlog list"
-                 type="list"
+                 type="cmdlist"
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/protocol/nameresolveorder.xml b/docs-xml/smbdotconf/protocol/nameresolveorder.xml
index 282bcbe..ec3aaf3 100644
--- a/docs-xml/smbdotconf/protocol/nameresolveorder.xml
+++ b/docs-xml/smbdotconf/protocol/nameresolveorder.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="name resolve order"
                  context="G"
-                 type="list"
+                 type="cmdlist"
                  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/smbports.xml b/docs-xml/smbdotconf/protocol/smbports.xml
index d46a5ed..ec1df65 100644
--- a/docs-xml/smbdotconf/protocol/smbports.xml
+++ b/docs-xml/smbdotconf/protocol/smbports.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="smb ports"
                  context="G"
-                 type="list"
+                 type="cmdlist"
                  handler="handle_smb_ports"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/protocol/svcctllist.xml b/docs-xml/smbdotconf/protocol/svcctllist.xml
index 53577b3..826bf70 100644
--- a/docs-xml/smbdotconf/protocol/svcctllist.xml
+++ b/docs-xml/smbdotconf/protocol/svcctllist.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="svcctl list"
-                 type="list"
+                 type="cmdlist"
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/adminusers.xml b/docs-xml/smbdotconf/security/adminusers.xml
index 654e1d5..5e0f60c 100644
--- a/docs-xml/smbdotconf/security/adminusers.xml
+++ b/docs-xml/smbdotconf/security/adminusers.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="admin users"
                  context="S"
-                 type="list"
+                 type="cmdlist"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This is a list of users who will be granted 
diff --git a/docs-xml/smbdotconf/security/authmethods.xml b/docs-xml/smbdotconf/security/authmethods.xml
index a5e3a11..386104d 100644
--- a/docs-xml/smbdotconf/security/authmethods.xml
+++ b/docs-xml/smbdotconf/security/authmethods.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="auth methods"
                  context="G"
-                 type="list"
+                 type="cmdlist"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/security/hostsallow.xml b/docs-xml/smbdotconf/security/hostsallow.xml
index d210277..8b4b622 100644
--- a/docs-xml/smbdotconf/security/hostsallow.xml
+++ b/docs-xml/smbdotconf/security/hostsallow.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="hosts allow"
                  context="S"
-                 type="list"
+                 type="cmdlist"
                  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 2c8504f..cd2f8de 100644
--- a/docs-xml/smbdotconf/security/hostsdeny.xml
+++ b/docs-xml/smbdotconf/security/hostsdeny.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="hosts deny"
                  context="S"
-                 type="list"
+                 type="cmdlist"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>deny hosts</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/security/invalidusers.xml b/docs-xml/smbdotconf/security/invalidusers.xml
index 9674465..b2fb2b9 100644
--- a/docs-xml/smbdotconf/security/invalidusers.xml
+++ b/docs-xml/smbdotconf/security/invalidusers.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="invalid users"
                  context="S"
-                 type="list"
+                 type="cmdlist"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This is a list of users that should not be allowed 
diff --git a/docs-xml/smbdotconf/security/preloadmodules.xml b/docs-xml/smbdotconf/security/preloadmodules.xml
index ad0df45..7b77674 100644
--- a/docs-xml/smbdotconf/security/preloadmodules.xml
+++ b/docs-xml/smbdotconf/security/preloadmodules.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="preload modules"
-                 type="list"
+                 type="cmdlist"
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/readlist.xml b/docs-xml/smbdotconf/security/readlist.xml
index 6ac0b3c..96f3746 100644
--- a/docs-xml/smbdotconf/security/readlist.xml
+++ b/docs-xml/smbdotconf/security/readlist.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="read list"
                  context="S"
-                 type="list"
+                 type="cmdlist"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/security/sambakcccommand.xml b/docs-xml/smbdotconf/security/sambakcccommand.xml
index cf94480..af8a28a 100644
--- a/docs-xml/smbdotconf/security/sambakcccommand.xml
+++ b/docs-xml/smbdotconf/security/sambakcccommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="samba kcc command"
                  context="G"
-                 type="list"
+                 type="cmdlist"
                  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/validusers.xml b/docs-xml/smbdotconf/security/validusers.xml
index 713c466..0b681a1 100644
--- a/docs-xml/smbdotconf/security/validusers.xml
+++ b/docs-xml/smbdotconf/security/validusers.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="valid users"
                  context="S"
-                 type="list"
+                 type="cmdlist"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/security/writelist.xml b/docs-xml/smbdotconf/security/writelist.xml
index 08ce2fa..a9b9e8b 100644
--- a/docs-xml/smbdotconf/security/writelist.xml
+++ b/docs-xml/smbdotconf/security/writelist.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="write list"
                  context="S"
-                 type="list"
+                 type="cmdlist"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/vfs/vfsobjects.xml b/docs-xml/smbdotconf/vfs/vfsobjects.xml
index 09d41c7..05903ba 100644
--- a/docs-xml/smbdotconf/vfs/vfsobjects.xml
+++ b/docs-xml/smbdotconf/vfs/vfsobjects.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="vfs objects"
-				type="list"
+                 type="cmdlist"
                  context="S"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>vfs object</synonym>
diff --git a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
index 5ec9ed6..d834744 100644
--- a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="winbind nss info"
                  context="G"
-                 type="list"
+                 type="cmdlist"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/wins/winsserver.xml b/docs-xml/smbdotconf/wins/winsserver.xml
index 69146fb..d323b38 100644
--- a/docs-xml/smbdotconf/wins/winsserver.xml
+++ b/docs-xml/smbdotconf/wins/winsserver.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="wins server"
                  context="G"
-				 type="list"
+                 type="cmdlist"
                  function="wins_server_list"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-- 
2.4.3


From 333e91a69c36c10261d6cbfab5ceb5a6edd72396 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 23 Jul 2015 17:34:28 +0200
Subject: [PATCH 11/13] docs:smbdotconf: change type to bytes where needed

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/smbdotconf/logging/maxlogsize.xml           | 2 +-
 docs-xml/smbdotconf/protocol/maxxmit.xml             | 2 +-
 docs-xml/smbdotconf/protocol/minreceivefilesize.xml  | 2 +-
 docs-xml/smbdotconf/protocol/smb2maxread.xml         | 2 +-
 docs-xml/smbdotconf/protocol/smb2maxtrans.xml        | 2 +-
 docs-xml/smbdotconf/protocol/smb2maxwrite.xml        | 2 +-
 docs-xml/smbdotconf/tuning/aioreadsize.xml           | 2 +-
 docs-xml/smbdotconf/tuning/aiowritesize.xml          | 2 +-
 docs-xml/smbdotconf/tuning/allocationroundupsize.xml | 2 +-
 docs-xml/smbdotconf/tuning/blocksize.xml             | 2 +-
 docs-xml/smbdotconf/tuning/maxdisksize.xml           | 2 +-
 docs-xml/smbdotconf/tuning/writecachesize.xml        | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs-xml/smbdotconf/logging/maxlogsize.xml b/docs-xml/smbdotconf/logging/maxlogsize.xml
index 35c2add..8a1979d 100644
--- a/docs-xml/smbdotconf/logging/maxlogsize.xml
+++ b/docs-xml/smbdotconf/logging/maxlogsize.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="max log size"
-                 type="integer"
+                 type="bytes"
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/protocol/maxxmit.xml b/docs-xml/smbdotconf/protocol/maxxmit.xml
index c589659..aca98d5 100644
--- a/docs-xml/smbdotconf/protocol/maxxmit.xml
+++ b/docs-xml/smbdotconf/protocol/maxxmit.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="max xmit"
                  context="G"
-                 type="integer"
+                 type="bytes"
                  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 60d48ac..ce0ea30 100644
--- a/docs-xml/smbdotconf/protocol/minreceivefilesize.xml
+++ b/docs-xml/smbdotconf/protocol/minreceivefilesize.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="min receivefile size"
-                 type="integer"
+                 type="bytes"
                  context="G"
                  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 a262ce1..01f9583 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxread.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxread.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="smb2 max read"
-                 type="integer"
+                 type="bytes"
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
index 4c28372..5586d3f 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="smb2 max trans"
-                 type="integer"
+                 type="bytes"
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
index 4105fa7..f895a04 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="smb2 max write"
-                 type="integer"
+                 type="bytes"
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/tuning/aioreadsize.xml b/docs-xml/smbdotconf/tuning/aioreadsize.xml
index 082cf5d..0c9cc52 100644
--- a/docs-xml/smbdotconf/tuning/aioreadsize.xml
+++ b/docs-xml/smbdotconf/tuning/aioreadsize.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="aio read size"
                  context="S"
-		 type="integer"
+                 type="bytes"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
   <para>If Samba has been built with asynchronous I/O support and this
diff --git a/docs-xml/smbdotconf/tuning/aiowritesize.xml b/docs-xml/smbdotconf/tuning/aiowritesize.xml
index e33a60e..c2ad118 100644
--- a/docs-xml/smbdotconf/tuning/aiowritesize.xml
+++ b/docs-xml/smbdotconf/tuning/aiowritesize.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="aio write size"
                  context="S"
-		 type="integer"
+                 type="bytes"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
   <para>If Samba has been built with asynchronous I/O support and this
diff --git a/docs-xml/smbdotconf/tuning/allocationroundupsize.xml b/docs-xml/smbdotconf/tuning/allocationroundupsize.xml
index 5fc013b..eaea467 100644
--- a/docs-xml/smbdotconf/tuning/allocationroundupsize.xml
+++ b/docs-xml/smbdotconf/tuning/allocationroundupsize.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="allocation roundup size"
                  context="S"
-		 type="integer"
+                 type="bytes"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter allows an administrator to tune the 
diff --git a/docs-xml/smbdotconf/tuning/blocksize.xml b/docs-xml/smbdotconf/tuning/blocksize.xml
index 1a0cc54..8d0dd8c 100644
--- a/docs-xml/smbdotconf/tuning/blocksize.xml
+++ b/docs-xml/smbdotconf/tuning/blocksize.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="block size"
-				type="integer"
+                 type="bytes"
                  context="S"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/tuning/maxdisksize.xml b/docs-xml/smbdotconf/tuning/maxdisksize.xml
index 27d74b9..0361358 100644
--- a/docs-xml/smbdotconf/tuning/maxdisksize.xml
+++ b/docs-xml/smbdotconf/tuning/maxdisksize.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="max disk size"
                  context="G"
-				 type="integer"
+                 type="bytes"
                  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/writecachesize.xml b/docs-xml/smbdotconf/tuning/writecachesize.xml
index e2fa17f..484b353 100644
--- a/docs-xml/smbdotconf/tuning/writecachesize.xml
+++ b/docs-xml/smbdotconf/tuning/writecachesize.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="write cache size"
                  context="S"
-				 type="integer"
+                 type="bytes"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>If this integer parameter is set to non-zero value,
-- 
2.4.3


From bc23634624de37b64b2280e51d1377fb5521e706 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 23 Jul 2015 17:41:28 +0200
Subject: [PATCH 12/13] docs:smbdotconf: change type to octal where needed

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/smbdotconf/security/createmask.xml         | 2 +-
 docs-xml/smbdotconf/security/directorymask.xml      | 2 +-
 docs-xml/smbdotconf/security/forcecreatemode.xml    | 2 +-
 docs-xml/smbdotconf/security/forcedirectorymode.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs-xml/smbdotconf/security/createmask.xml b/docs-xml/smbdotconf/security/createmask.xml
index 8b38be4..06ee896 100644
--- a/docs-xml/smbdotconf/security/createmask.xml
+++ b/docs-xml/smbdotconf/security/createmask.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="create mask"
                  context="S"
-                 type="integer"
+                 type="octal"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 
 <synonym>create mode</synonym>
diff --git a/docs-xml/smbdotconf/security/directorymask.xml b/docs-xml/smbdotconf/security/directorymask.xml
index 50305d9..890092a 100644
--- a/docs-xml/smbdotconf/security/directorymask.xml
+++ b/docs-xml/smbdotconf/security/directorymask.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="directory mask"
                  context="S"
-                 type="integer"
+                 type="octal"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>directory mode</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/security/forcecreatemode.xml b/docs-xml/smbdotconf/security/forcecreatemode.xml
index 2b7f1bb..79e6e63 100644
--- a/docs-xml/smbdotconf/security/forcecreatemode.xml
+++ b/docs-xml/smbdotconf/security/forcecreatemode.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="force create mode"
                  context="S"
-                 type="integer"
+                 type="octal"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter specifies a set of UNIX mode bit
diff --git a/docs-xml/smbdotconf/security/forcedirectorymode.xml b/docs-xml/smbdotconf/security/forcedirectorymode.xml
index 9d2fdfc..aa8375a 100644
--- a/docs-xml/smbdotconf/security/forcedirectorymode.xml
+++ b/docs-xml/smbdotconf/security/forcedirectorymode.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="force directory mode"
                  context="S"
-                 type="integer"
+                 type="octal"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter specifies a set of UNIX mode bit 
-- 
2.4.3


From 1ada0ca5eddecf2051a33213807771ef1326e2b3 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 23 Jul 2015 17:42:22 +0200
Subject: [PATCH 13/13] docs:smbdotconf: change type to ustring where needed.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/smbdotconf/base/netbiosname.xml  | 2 +-
 docs-xml/smbdotconf/base/netbiosscope.xml | 2 +-
 docs-xml/smbdotconf/base/workgroup.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs-xml/smbdotconf/base/netbiosname.xml b/docs-xml/smbdotconf/base/netbiosname.xml
index ed7dd5e..a7d9e2c 100644
--- a/docs-xml/smbdotconf/base/netbiosname.xml
+++ b/docs-xml/smbdotconf/base/netbiosname.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="netbios name"
                  context="G"
-                 type="string"
+                 type="ustring"
                  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 1b84aae..c5be028 100644
--- a/docs-xml/smbdotconf/base/netbiosscope.xml
+++ b/docs-xml/smbdotconf/base/netbiosscope.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="netbios scope"
                  context="G"
-                 type="string"
+                 type="ustring"
                  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 bf650ff..eb8ca18 100644
--- a/docs-xml/smbdotconf/base/workgroup.xml
+++ b/docs-xml/smbdotconf/base/workgroup.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="workgroup"
                  context="G"
-                 type="string"
+                 type="ustring"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-- 
2.4.3

-------------- 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/20150724/e50cef69/attachment.sig>


More information about the samba-technical mailing list