From 24905ba82d2f1b9e01df7a6e03d853c5138bc148 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Tue, 19 Nov 2019 11:53:50 +0100 Subject: [PATCH] docs-xml: remove explicit "constant" The constant mark applied to types "string" and "ustring". The previous patches in this patchset already markes all string options as either constant or substituted, but it's still possible to add options or change existing ones to be neither constant nor substituted. In order to enforce strings to be either constant or substitued, remove the explicit constant marker. Instead, any option that is not marked as substituted is implicitly made constant. This patch doesn't change behaviour and all generated files are the same before and after this change. Signed-off-by: Ralph Boehme Reviewed-by: Stefan Metzmacher --- docs-xml/smbdotconf/base/doscharset.xml | 1 - docs-xml/smbdotconf/base/netbiosname.xml | 1 - docs-xml/smbdotconf/base/netbiosscope.xml | 1 - docs-xml/smbdotconf/base/realm.xml | 1 - docs-xml/smbdotconf/base/sharebackend.xml | 1 - docs-xml/smbdotconf/base/unixcharset.xml | 1 - docs-xml/smbdotconf/base/workgroup.xml | 1 - docs-xml/smbdotconf/filename/manglingmethod.xml | 1 - docs-xml/smbdotconf/ldap/ldapadmindn.xml | 1 - docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml | 1 - docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml | 1 - docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml | 1 - docs-xml/smbdotconf/ldap/ldapsuffix.xml | 1 - docs-xml/smbdotconf/ldap/ldapusersuffix.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/misc/afsusernamemap.xml | 1 - docs-xml/smbdotconf/misc/cachedirectory.xml | 1 - docs-xml/smbdotconf/misc/ctdbdsocket.xml | 1 - docs-xml/smbdotconf/misc/fstype.xml | 1 - docs-xml/smbdotconf/misc/lockdirectory.xml | 1 - .../smbdotconf/misc/nbtclientsocketaddress.xml | 1 - docs-xml/smbdotconf/misc/ncalrpcdir.xml | 1 - docs-xml/smbdotconf/misc/piddirectory.xml | 1 - docs-xml/smbdotconf/misc/statedirectory.xml | 1 - .../smbdotconf/misc/usersharetemplateshare.xml | 1 - docs-xml/smbdotconf/misc/utmpdirectory.xml | 1 - docs-xml/smbdotconf/misc/wtmpdirectory.xml | 1 - docs-xml/smbdotconf/printing/lppausecommand.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/printcapname.xml | 1 - docs-xml/smbdotconf/printing/printcommand.xml | 1 - docs-xml/smbdotconf/printing/printjobusername.xml | 1 - docs-xml/smbdotconf/printing/queuepausecommand.xml | 1 - .../smbdotconf/printing/queueresumecommand.xml | 1 - .../smbdotconf/rpc/rpcserverdynamicportrange.xml | 1 - docs-xml/smbdotconf/security/binddnsdir.xml | 1 - .../smbdotconf/security/dedicatedkeytabfile.xml | 1 - docs-xml/smbdotconf/security/guestaccount.xml | 1 - .../security/ntpsigndsocketdirectory.xml | 1 - docs-xml/smbdotconf/security/passdbbackend.xml | 1 - docs-xml/smbdotconf/security/passwordserver.xml | 1 - docs-xml/smbdotconf/security/privatedir.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/tlskeyfile.xml | 1 - docs-xml/smbdotconf/security/tlspriority.xml | 1 - docs-xml/smbdotconf/tuning/socketoptions.xml | 1 - docs-xml/smbdotconf/winbind/templatehomedir.xml | 1 - docs-xml/smbdotconf/winbind/templateshell.xml | 1 - .../smbdotconf/winbind/winbinddsocketdirectory.xml | 1 - docs-xml/smbdotconf/winbind/winbindseparator.xml | 1 - script/generate_param.py | 67 +++++++++++----------- 60 files changed, 33 insertions(+), 93 deletions(-) diff --git a/docs-xml/smbdotconf/base/doscharset.xml b/docs-xml/smbdotconf/base/doscharset.xml index c99b8403ccf..ebd7586158c 100644 --- a/docs-xml/smbdotconf/base/doscharset.xml +++ b/docs-xml/smbdotconf/base/doscharset.xml @@ -1,7 +1,6 @@ diff --git a/docs-xml/smbdotconf/base/netbiosname.xml b/docs-xml/smbdotconf/base/netbiosname.xml index 89cf73add31..e9e05382d44 100644 --- a/docs-xml/smbdotconf/base/netbiosname.xml +++ b/docs-xml/smbdotconf/base/netbiosname.xml @@ -1,7 +1,6 @@ diff --git a/docs-xml/smbdotconf/base/netbiosscope.xml b/docs-xml/smbdotconf/base/netbiosscope.xml index c5be02825a1..078697f4805 100644 --- a/docs-xml/smbdotconf/base/netbiosscope.xml +++ b/docs-xml/smbdotconf/base/netbiosscope.xml @@ -1,7 +1,6 @@ This sets the NetBIOS scope that Samba will diff --git a/docs-xml/smbdotconf/base/realm.xml b/docs-xml/smbdotconf/base/realm.xml index 8499c786d4f..dd39c1bb0d4 100644 --- a/docs-xml/smbdotconf/base/realm.xml +++ b/docs-xml/smbdotconf/base/realm.xml @@ -1,7 +1,6 @@ diff --git a/docs-xml/smbdotconf/base/sharebackend.xml b/docs-xml/smbdotconf/base/sharebackend.xml index 08124cd21dc..4da8b177da1 100644 --- a/docs-xml/smbdotconf/base/sharebackend.xml +++ b/docs-xml/smbdotconf/base/sharebackend.xml @@ -1,7 +1,6 @@ diff --git a/docs-xml/smbdotconf/base/unixcharset.xml b/docs-xml/smbdotconf/base/unixcharset.xml index 06754a419f0..23c4f1edf43 100644 --- a/docs-xml/smbdotconf/base/unixcharset.xml +++ b/docs-xml/smbdotconf/base/unixcharset.xml @@ -1,7 +1,6 @@ diff --git a/docs-xml/smbdotconf/base/workgroup.xml b/docs-xml/smbdotconf/base/workgroup.xml index eb8ca182c94..1408147810e 100644 --- a/docs-xml/smbdotconf/base/workgroup.xml +++ b/docs-xml/smbdotconf/base/workgroup.xml @@ -1,7 +1,6 @@ This controls what workgroup your server will diff --git a/docs-xml/smbdotconf/filename/manglingmethod.xml b/docs-xml/smbdotconf/filename/manglingmethod.xml index ef3a59b33bf..559ed6c9a79 100644 --- a/docs-xml/smbdotconf/filename/manglingmethod.xml +++ b/docs-xml/smbdotconf/filename/manglingmethod.xml @@ -1,7 +1,6 @@ controls the algorithm used for the generating diff --git a/docs-xml/smbdotconf/ldap/ldapadmindn.xml b/docs-xml/smbdotconf/ldap/ldapadmindn.xml index 5f5476b0f4c..1f3d20f003a 100644 --- a/docs-xml/smbdotconf/ldap/ldapadmindn.xml +++ b/docs-xml/smbdotconf/ldap/ldapadmindn.xml @@ -1,7 +1,6 @@ diff --git a/docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml b/docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml index adcf471a333..7de0fac169e 100644 --- a/docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml +++ b/docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml @@ -2,7 +2,6 @@ context="G" type="string" function="_ldap_group_suffix" - constant="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> This parameter specifies the suffix that is diff --git a/docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml b/docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml index 2690af83779..1fe7e8ae388 100644 --- a/docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml +++ b/docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml @@ -2,7 +2,6 @@ context="G" type="string" function="_ldap_idmap_suffix" - constant="1" 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 22f66a8a0eb..e82675b1e4f 100644 --- a/docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml +++ b/docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml @@ -2,7 +2,6 @@ context="G" type="string" function="_ldap_machine_suffix" - constant="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> diff --git a/docs-xml/smbdotconf/ldap/ldapsuffix.xml b/docs-xml/smbdotconf/ldap/ldapsuffix.xml index 0ecb9c79222..aeff0dd6f9b 100644 --- a/docs-xml/smbdotconf/ldap/ldapsuffix.xml +++ b/docs-xml/smbdotconf/ldap/ldapsuffix.xml @@ -1,7 +1,6 @@ Specifies the base for all ldap suffixes and for storing the sambaDomain object. diff --git a/docs-xml/smbdotconf/ldap/ldapusersuffix.xml b/docs-xml/smbdotconf/ldap/ldapusersuffix.xml index 85bece3601f..8e6b8a340e4 100644 --- a/docs-xml/smbdotconf/ldap/ldapusersuffix.xml +++ b/docs-xml/smbdotconf/ldap/ldapusersuffix.xml @@ -2,7 +2,6 @@ context="G" type="string" function="_ldap_user_suffix" - constant="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> diff --git a/docs-xml/smbdotconf/logon/logondrive.xml b/docs-xml/smbdotconf/logon/logondrive.xml index 9f615986c4f..9767693244c 100644 --- a/docs-xml/smbdotconf/logon/logondrive.xml +++ b/docs-xml/smbdotconf/logon/logondrive.xml @@ -1,7 +1,6 @@ diff --git a/docs-xml/smbdotconf/logon/logonhome.xml b/docs-xml/smbdotconf/logon/logonhome.xml index d2116740d2a..cb5f5d5060b 100644 --- a/docs-xml/smbdotconf/logon/logonhome.xml +++ b/docs-xml/smbdotconf/logon/logonhome.xml @@ -1,7 +1,6 @@ diff --git a/docs-xml/smbdotconf/logon/logonpath.xml b/docs-xml/smbdotconf/logon/logonpath.xml index 106bb59453d..440ebc4284e 100644 --- a/docs-xml/smbdotconf/logon/logonpath.xml +++ b/docs-xml/smbdotconf/logon/logonpath.xml @@ -1,7 +1,6 @@ diff --git a/docs-xml/smbdotconf/logon/logonscript.xml b/docs-xml/smbdotconf/logon/logonscript.xml index 3142a6c84aa..cf024662214 100644 --- a/docs-xml/smbdotconf/logon/logonscript.xml +++ b/docs-xml/smbdotconf/logon/logonscript.xml @@ -1,7 +1,6 @@ diff --git a/docs-xml/smbdotconf/misc/afsusernamemap.xml b/docs-xml/smbdotconf/misc/afsusernamemap.xml index 4dc3d465744..f3f7390f4c5 100644 --- a/docs-xml/smbdotconf/misc/afsusernamemap.xml +++ b/docs-xml/smbdotconf/misc/afsusernamemap.xml @@ -1,7 +1,6 @@ If you are using the fake kaserver AFS feature, you might diff --git a/docs-xml/smbdotconf/misc/cachedirectory.xml b/docs-xml/smbdotconf/misc/cachedirectory.xml index 21d7d9461d8..480f31b63cf 100644 --- a/docs-xml/smbdotconf/misc/cachedirectory.xml +++ b/docs-xml/smbdotconf/misc/cachedirectory.xml @@ -1,7 +1,6 @@ Usually, most of the TDB files are stored in the diff --git a/docs-xml/smbdotconf/misc/fstype.xml b/docs-xml/smbdotconf/misc/fstype.xml index 822b451c5e4..437bd5ca0d8 100644 --- a/docs-xml/smbdotconf/misc/fstype.xml +++ b/docs-xml/smbdotconf/misc/fstype.xml @@ -1,7 +1,6 @@ diff --git a/docs-xml/smbdotconf/misc/lockdirectory.xml b/docs-xml/smbdotconf/misc/lockdirectory.xml index f8f64ff9fef..cf0ea2be40c 100644 --- a/docs-xml/smbdotconf/misc/lockdirectory.xml +++ b/docs-xml/smbdotconf/misc/lockdirectory.xml @@ -1,7 +1,6 @@ lock dir diff --git a/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml b/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml index 0833c63d682..12815dcfa22 100644 --- a/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml +++ b/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml @@ -1,7 +1,6 @@ socket address diff --git a/docs-xml/smbdotconf/misc/ncalrpcdir.xml b/docs-xml/smbdotconf/misc/ncalrpcdir.xml index 2fa1019309a..4bbd22249b0 100644 --- a/docs-xml/smbdotconf/misc/ncalrpcdir.xml +++ b/docs-xml/smbdotconf/misc/ncalrpcdir.xml @@ -1,7 +1,6 @@ This directory will hold a series of named pipes to allow RPC over inter-process communication. diff --git a/docs-xml/smbdotconf/misc/piddirectory.xml b/docs-xml/smbdotconf/misc/piddirectory.xml index b53730d52c0..d006372a2b9 100644 --- a/docs-xml/smbdotconf/misc/piddirectory.xml +++ b/docs-xml/smbdotconf/misc/piddirectory.xml @@ -1,7 +1,6 @@ diff --git a/docs-xml/smbdotconf/misc/statedirectory.xml b/docs-xml/smbdotconf/misc/statedirectory.xml index 2f2b0642ea9..12481fc8d34 100644 --- a/docs-xml/smbdotconf/misc/statedirectory.xml +++ b/docs-xml/smbdotconf/misc/statedirectory.xml @@ -1,7 +1,6 @@ Usually, most of the TDB files are stored in the diff --git a/docs-xml/smbdotconf/misc/usersharetemplateshare.xml b/docs-xml/smbdotconf/misc/usersharetemplateshare.xml index 2b3c112ddf1..3a74dcb8f0f 100644 --- a/docs-xml/smbdotconf/misc/usersharetemplateshare.xml +++ b/docs-xml/smbdotconf/misc/usersharetemplateshare.xml @@ -1,7 +1,6 @@ User defined shares only have limited possible parameters diff --git a/docs-xml/smbdotconf/misc/utmpdirectory.xml b/docs-xml/smbdotconf/misc/utmpdirectory.xml index 82c8f10fd71..96b45dbec56 100644 --- a/docs-xml/smbdotconf/misc/utmpdirectory.xml +++ b/docs-xml/smbdotconf/misc/utmpdirectory.xml @@ -1,7 +1,6 @@ This parameter is only available if Samba has diff --git a/docs-xml/smbdotconf/misc/wtmpdirectory.xml b/docs-xml/smbdotconf/misc/wtmpdirectory.xml index eb9d8767241..f1b53592a47 100644 --- a/docs-xml/smbdotconf/misc/wtmpdirectory.xml +++ b/docs-xml/smbdotconf/misc/wtmpdirectory.xml @@ -1,7 +1,6 @@ diff --git a/docs-xml/smbdotconf/printing/lppausecommand.xml b/docs-xml/smbdotconf/printing/lppausecommand.xml index f2518d3def0..3aa134c4377 100644 --- a/docs-xml/smbdotconf/printing/lppausecommand.xml +++ b/docs-xml/smbdotconf/printing/lppausecommand.xml @@ -1,7 +1,6 @@ This parameter specifies the command to be diff --git a/docs-xml/smbdotconf/printing/lpqcommand.xml b/docs-xml/smbdotconf/printing/lpqcommand.xml index f0161f3448d..f3c17f286d1 100644 --- a/docs-xml/smbdotconf/printing/lpqcommand.xml +++ b/docs-xml/smbdotconf/printing/lpqcommand.xml @@ -1,7 +1,6 @@ This parameter specifies the command to be diff --git a/docs-xml/smbdotconf/printing/lpresumecommand.xml b/docs-xml/smbdotconf/printing/lpresumecommand.xml index 2cee574bd73..153ba76a693 100644 --- a/docs-xml/smbdotconf/printing/lpresumecommand.xml +++ b/docs-xml/smbdotconf/printing/lpresumecommand.xml @@ -1,7 +1,6 @@ This parameter specifies the command to be diff --git a/docs-xml/smbdotconf/printing/lprmcommand.xml b/docs-xml/smbdotconf/printing/lprmcommand.xml index a595c1225c0..4b7f3dd75c3 100644 --- a/docs-xml/smbdotconf/printing/lprmcommand.xml +++ b/docs-xml/smbdotconf/printing/lprmcommand.xml @@ -1,7 +1,6 @@ This parameter specifies the command to be diff --git a/docs-xml/smbdotconf/printing/printcapname.xml b/docs-xml/smbdotconf/printing/printcapname.xml index 64acc265aef..3a65d23b905 100644 --- a/docs-xml/smbdotconf/printing/printcapname.xml +++ b/docs-xml/smbdotconf/printing/printcapname.xml @@ -1,7 +1,6 @@ printcap diff --git a/docs-xml/smbdotconf/printing/printcommand.xml b/docs-xml/smbdotconf/printing/printcommand.xml index 42a7188cb9a..c84e45f404d 100644 --- a/docs-xml/smbdotconf/printing/printcommand.xml +++ b/docs-xml/smbdotconf/printing/printcommand.xml @@ -1,7 +1,6 @@ After a print job has finished spooling to diff --git a/docs-xml/smbdotconf/printing/printjobusername.xml b/docs-xml/smbdotconf/printing/printjobusername.xml index 872a2e592ed..06209f74c6a 100644 --- a/docs-xml/smbdotconf/printing/printjobusername.xml +++ b/docs-xml/smbdotconf/printing/printjobusername.xml @@ -1,7 +1,6 @@ This parameter specifies which user information will be diff --git a/docs-xml/smbdotconf/printing/queuepausecommand.xml b/docs-xml/smbdotconf/printing/queuepausecommand.xml index 600a2baa621..5dca45657cc 100644 --- a/docs-xml/smbdotconf/printing/queuepausecommand.xml +++ b/docs-xml/smbdotconf/printing/queuepausecommand.xml @@ -1,7 +1,6 @@ This parameter specifies the command to be diff --git a/docs-xml/smbdotconf/printing/queueresumecommand.xml b/docs-xml/smbdotconf/printing/queueresumecommand.xml index 431295a804e..4a573330048 100644 --- a/docs-xml/smbdotconf/printing/queueresumecommand.xml +++ b/docs-xml/smbdotconf/printing/queueresumecommand.xml @@ -1,7 +1,6 @@ This parameter specifies the command to be diff --git a/docs-xml/smbdotconf/rpc/rpcserverdynamicportrange.xml b/docs-xml/smbdotconf/rpc/rpcserverdynamicportrange.xml index 1b9c752cf43..e8d72681fd9 100644 --- a/docs-xml/smbdotconf/rpc/rpcserverdynamicportrange.xml +++ b/docs-xml/smbdotconf/rpc/rpcserverdynamicportrange.xml @@ -2,7 +2,6 @@ context="G" type="string" handler="handle_rpc_server_dynamic_port_range" - constant="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> diff --git a/docs-xml/smbdotconf/security/binddnsdir.xml b/docs-xml/smbdotconf/security/binddnsdir.xml index c296a0ef81d..a948cb59234 100644 --- a/docs-xml/smbdotconf/security/binddnsdir.xml +++ b/docs-xml/smbdotconf/security/binddnsdir.xml @@ -1,7 +1,6 @@ bind dns directory diff --git a/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml b/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml index 8405b48028d..b7c26806b6e 100644 --- a/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml +++ b/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml @@ -1,7 +1,6 @@ diff --git a/docs-xml/smbdotconf/security/guestaccount.xml b/docs-xml/smbdotconf/security/guestaccount.xml index c5dbbd9e1ce..2914630072a 100644 --- a/docs-xml/smbdotconf/security/guestaccount.xml +++ b/docs-xml/smbdotconf/security/guestaccount.xml @@ -1,7 +1,6 @@ This is a username which will be used for access diff --git a/docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml b/docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml index a2c92a4aa31..18d70cf41e1 100644 --- a/docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml +++ b/docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml @@ -1,7 +1,6 @@ This setting controls the location of the socket that diff --git a/docs-xml/smbdotconf/security/passdbbackend.xml b/docs-xml/smbdotconf/security/passdbbackend.xml index 3e378bd07c5..8265b3ed547 100644 --- a/docs-xml/smbdotconf/security/passdbbackend.xml +++ b/docs-xml/smbdotconf/security/passdbbackend.xml @@ -1,7 +1,6 @@ diff --git a/docs-xml/smbdotconf/security/passwordserver.xml b/docs-xml/smbdotconf/security/passwordserver.xml index a62494b9b48..8bc2ecb8502 100644 --- a/docs-xml/smbdotconf/security/passwordserver.xml +++ b/docs-xml/smbdotconf/security/passwordserver.xml @@ -1,7 +1,6 @@ By specifying the name of a domain controller with this option, diff --git a/docs-xml/smbdotconf/security/privatedir.xml b/docs-xml/smbdotconf/security/privatedir.xml index 58be37281d9..9abcb7e01d7 100644 --- a/docs-xml/smbdotconf/security/privatedir.xml +++ b/docs-xml/smbdotconf/security/privatedir.xml @@ -1,7 +1,6 @@ private directory diff --git a/docs-xml/smbdotconf/security/smbpasswdfile.xml b/docs-xml/smbdotconf/security/smbpasswdfile.xml index a906403473f..fab70378c4f 100644 --- a/docs-xml/smbdotconf/security/smbpasswdfile.xml +++ b/docs-xml/smbdotconf/security/smbpasswdfile.xml @@ -1,7 +1,6 @@ This option sets the path to the encrypted smbpasswd file. By diff --git a/docs-xml/smbdotconf/security/tlscafile.xml b/docs-xml/smbdotconf/security/tlscafile.xml index 149891342c8..bcbac62a417 100644 --- a/docs-xml/smbdotconf/security/tlscafile.xml +++ b/docs-xml/smbdotconf/security/tlscafile.xml @@ -2,7 +2,6 @@ type="string" context="G" function="_tls_cafile" - constant="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> This option can be set to a file (PEM format) diff --git a/docs-xml/smbdotconf/security/tlscertfile.xml b/docs-xml/smbdotconf/security/tlscertfile.xml index 0d06936a041..cf7095475f3 100644 --- a/docs-xml/smbdotconf/security/tlscertfile.xml +++ b/docs-xml/smbdotconf/security/tlscertfile.xml @@ -2,7 +2,6 @@ type="string" context="G" function="_tls_certfile" - constant="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> This option can be set to a file (PEM format) diff --git a/docs-xml/smbdotconf/security/tlscrlfile.xml b/docs-xml/smbdotconf/security/tlscrlfile.xml index c0f1cfb5b8b..1f42b859a11 100644 --- a/docs-xml/smbdotconf/security/tlscrlfile.xml +++ b/docs-xml/smbdotconf/security/tlscrlfile.xml @@ -2,7 +2,6 @@ type="string" context="G" function="_tls_crlfile" - constant="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> This option can be set to a file containing a certificate diff --git a/docs-xml/smbdotconf/security/tlsdhparamsfile.xml b/docs-xml/smbdotconf/security/tlsdhparamsfile.xml index 4a5361c8c23..5bf59aacd1a 100644 --- a/docs-xml/smbdotconf/security/tlsdhparamsfile.xml +++ b/docs-xml/smbdotconf/security/tlsdhparamsfile.xml @@ -2,7 +2,6 @@ type="string" context="G" function="_tls_dhpfile" - constant="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> This option can be set to a file with Diffie-Hellman parameters diff --git a/docs-xml/smbdotconf/security/tlskeyfile.xml b/docs-xml/smbdotconf/security/tlskeyfile.xml index e6b4a544cae..9caa8241fa8 100644 --- a/docs-xml/smbdotconf/security/tlskeyfile.xml +++ b/docs-xml/smbdotconf/security/tlskeyfile.xml @@ -2,7 +2,6 @@ type="string" context="G" function="_tls_keyfile" - constant="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> This option can be set to a file (PEM format) diff --git a/docs-xml/smbdotconf/security/tlspriority.xml b/docs-xml/smbdotconf/security/tlspriority.xml index d399eef8eef..d7214a4c1ea 100644 --- a/docs-xml/smbdotconf/security/tlspriority.xml +++ b/docs-xml/smbdotconf/security/tlspriority.xml @@ -1,7 +1,6 @@ This option can be set to a string describing the TLS protocols diff --git a/docs-xml/smbdotconf/tuning/socketoptions.xml b/docs-xml/smbdotconf/tuning/socketoptions.xml index fd61163661a..c0bd785cb78 100644 --- a/docs-xml/smbdotconf/tuning/socketoptions.xml +++ b/docs-xml/smbdotconf/tuning/socketoptions.xml @@ -1,7 +1,6 @@ diff --git a/docs-xml/smbdotconf/winbind/templatehomedir.xml b/docs-xml/smbdotconf/winbind/templatehomedir.xml index cbf391ce199..2801edf47e3 100644 --- a/docs-xml/smbdotconf/winbind/templatehomedir.xml +++ b/docs-xml/smbdotconf/winbind/templatehomedir.xml @@ -1,7 +1,6 @@ When filling out the user information for a Windows NT diff --git a/docs-xml/smbdotconf/winbind/templateshell.xml b/docs-xml/smbdotconf/winbind/templateshell.xml index 21e44e6cb5e..891c4242e8f 100644 --- a/docs-xml/smbdotconf/winbind/templateshell.xml +++ b/docs-xml/smbdotconf/winbind/templateshell.xml @@ -1,7 +1,6 @@ When filling out the user information for a Windows NT diff --git a/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml b/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml index 842cff12b2b..7827d36d6a5 100644 --- a/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml +++ b/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml @@ -1,7 +1,6 @@ This setting controls the location of the winbind daemon's socket. diff --git a/docs-xml/smbdotconf/winbind/winbindseparator.xml b/docs-xml/smbdotconf/winbind/winbindseparator.xml index 1c1632fbdff..eda14f4e03a 100644 --- a/docs-xml/smbdotconf/winbind/winbindseparator.xml +++ b/docs-xml/smbdotconf/winbind/winbindseparator.xml @@ -1,7 +1,6 @@ This parameter allows an admin to define the character diff --git a/script/generate_param.py b/script/generate_param.py index 55f2b65271b..c29a29df57e 100644 --- a/script/generate_param.py +++ b/script/generate_param.py @@ -135,10 +135,11 @@ def generate_functions(path_in, path_out): if temp is None: raise Exception(parameter['name'] + " has an invalid context " + parameter['context']) output_string += temp - if parameter['constant']: - output_string += "_CONST" - if parameter['substitution']: - output_string += "_SUBSTITUTED" + if parameter['type'] == "string" or parameter['type'] == "ustring": + if parameter['substitution']: + output_string += "_SUBSTITUTED" + else: + output_string += "_CONST" if parameter['parm']: output_string += "_PARM" temp = param_type_dict.get(parameter['type']) @@ -182,8 +183,6 @@ def make_s3_param_proto(path_in, path_out): continue output_string = "" - if parameter['constant']: - output_string += 'const ' param_type = mapping.get(parameter['type']) if param_type is None: raise Exception(parameter['name'] + " has an invalid context " + parameter['context']) @@ -196,20 +195,21 @@ def make_s3_param_proto(path_in, path_out): else: param = "int" - if parameter['type'] == 'string' and parameter['substitution']: - if parameter['context'] == 'G': - output_string += '(TALLOC_CTX *ctx, const struct loadparm_substitution *lp_sub);\n' - elif parameter['context'] == 'S': - output_string += '(TALLOC_CTX *ctx, const struct loadparm_substitution *lp_sub, %s);\n' % param - else: - raise Exception(parameter['name'] + " has an invalid param type " + parameter['type']) - elif parameter['type'] == 'string' and not parameter['constant']: - if parameter['context'] == 'G': - output_string += '(TALLOC_CTX *ctx);\n' - elif parameter['context'] == 'S': - output_string += '(TALLOC_CTX *ctx, %s);\n' % param + if parameter['type'] == 'string' or parameter['type'] == 'ustring': + if parameter['substitution']: + if parameter['context'] == 'G': + output_string += '(TALLOC_CTX *ctx, const struct loadparm_substitution *lp_sub);\n' + elif parameter['context'] == 'S': + output_string += '(TALLOC_CTX *ctx, const struct loadparm_substitution *lp_sub, %s);\n' % param + else: + raise Exception(parameter['name'] + " has an invalid param type " + parameter['type']) else: - raise Exception(parameter['name'] + " has an invalid param type " + parameter['type']) + if parameter['context'] == 'G': + output_string = 'const ' + output_string + '(void);\n' + elif parameter['context'] == 'S': + output_string = 'const ' + output_string + '(%s);\n' % param + else: + raise Exception(parameter['name'] + " has an invalid param type " + parameter['type']) else: if parameter['context'] == 'G': output_string += '(void);\n' @@ -239,8 +239,6 @@ def make_lib_proto(path_in, path_out): continue output_string = "" - if parameter['constant']: - output_string += 'const ' param_type = mapping.get(parameter['type']) if param_type is None: raise Exception(parameter['name'] + " has an invalid context " + parameter['context']) @@ -248,20 +246,21 @@ def make_lib_proto(path_in, path_out): output_string += "lpcfg_%s" % parameter['function'] - if parameter['type'] == 'string' and parameter['substitution']: - if parameter['context'] == 'G': - output_string += '(struct loadparm_context *, const struct loadparm_substitution *lp_sub, TALLOC_CTX *ctx);\n' - elif parameter['context'] == 'S': - output_string += '(struct loadparm_service *, struct loadparm_service *, TALLOC_CTX *ctx);\n' + if parameter['type'] == 'string' or parameter['type'] == 'ustring': + if parameter['substitution']: + if parameter['context'] == 'G': + output_string += '(struct loadparm_context *, const struct loadparm_substitution *lp_sub, TALLOC_CTX *ctx);\n' + elif parameter['context'] == 'S': + output_string += '(struct loadparm_service *, struct loadparm_service *, TALLOC_CTX *ctx);\n' + else: + raise Exception(parameter['name'] + " has an invalid context " + parameter['context']) else: - raise Exception(parameter['name'] + " has an invalid context " + parameter['context']) - elif parameter['type'] == 'string' and not parameter['constant']: - if parameter['context'] == 'G': - output_string += '(struct loadparm_context *, TALLOC_CTX *ctx);\n' - elif parameter['context'] == 'S': - output_string += '(struct loadparm_service *, struct loadparm_service *, TALLOC_CTX *ctx);\n' - else: - raise Exception(parameter['name'] + " has an invalid param type " + parameter['type']) + if parameter['context'] == 'G': + output_string = 'const ' + output_string + '(struct loadparm_context *);\n' + elif parameter['context'] == 'S': + output_string = 'const ' + output_string + '(struct loadparm_service *, struct loadparm_service *);\n' + else: + raise Exception(parameter['name'] + " has an invalid param type " + parameter['type']) else: if parameter['context'] == 'G': output_string += '(struct loadparm_context *);\n' -- 2.11.4.GIT