[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Tue May 29 22:05:03 MDT 2012
The branch, master has been updated
via 27fb14b s3-loadparm: Swap synonyms of max/min protocol to server max/min protocol
via 1d3e5ed s3-build: We do not have CHARSET modules any more
via dde4d6f lib/param: Put common FN_ macros into param_functions.c
via 3dcea0f lib/param: Add a few more s3 parameters
via 9f4b6fa s3-param: Use same function name for "max xmit" as lib/param
via 2168156 s3-param: Use same variable names as lib/param
via 56996e0 s3-param: Import parameters from lib/param to make this list common
via b47f9a0 s3-param: Rename lp_dns_proxy() -> lp_wins_dns_proxy() for clarity
via 38b1a11 lib/param: Import s3 parameters into lib/param to allow the parameter lists merge
via 89981c7 lib/param: Mark a few more parameters const (matching s3)
via f0d5300 param: mark realm parameter as const
via b225248 param: Sort global param functions macros to ease the s3/s4 merge
via ec14445 lib/param: Add .flags to max/min protocol to match s3
via 073a370 lib/param: Add .flags to wins parameters to match s3
via d3f061b lib/param: Harmonise 'password server' parameter between s3 and s4
via 91e4983 s3-build: Remove build of libtdb.so from the autoconf build
via ac63b55 s3-build: Remove build of libtalloc.so from the autoconf build
via 53d4ffc s3-iconv: Remove unused script/gen-8bit-gap.sh
via c691ada build: Provide .pc file for libsmbsharemodes
via 3ef6234 build: Provide .pc file for libnetapi
via 8ddd2a8 build: Remove unused release scripts for tevent
via c8877d8 build: Remove unused release scripts for tdb
via ccb7642 build: Remove unused release scripts for talloc
from aa01908 libcli/dns: Rename UDP-based calls to reflect their use
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 27fb14bfbe9d49bacd80fc033132c254267aeb34
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 15:00:12 2012 +1000
s3-loadparm: Swap synonyms of max/min protocol to server max/min protocol
This matches the lib/param code, as is a seperate parameter for the
client there.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Wed May 30 06:04:41 CEST 2012 on sn-devel-104
commit 1d3e5eda038deebe7e3d2d122c8d9963b548edfb
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 30 08:23:38 2012 +1000
s3-build: We do not have CHARSET modules any more
commit dde4d6fce9e3daa6a2332b9cbc0165a18fca0ccd
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 17:30:44 2012 +1000
lib/param: Put common FN_ macros into param_functions.c
This will in turn make it possible to put the actual parameter
definitions in common.
Andrew Bartlett
commit 3dcea0f6c7d8cd08a4affe3b54061cdcb2de1c50
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 17:35:30 2012 +1000
lib/param: Add a few more s3 parameters
commit 9f4b6fa0ccdd5b0f499a26aa246e04d6652befc9
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 17:28:04 2012 +1000
s3-param: Use same function name for "max xmit" as lib/param
Again, this helps with merging the FN_ list.
Andrew Bartlett
commit 21681569795040c62e5cbd38b39ae4df351cbe23
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 17:19:07 2012 +1000
s3-param: Use same variable names as lib/param
Again, this helps with merging the FN_ list.
Andrew Bartlett
commit 56996e00bf26d6a64e2f60f2ed7cb8c2e5068934
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 17:14:05 2012 +1000
s3-param: Import parameters from lib/param to make this list common
This will allow the list of FN_ macros to be made a common .c file.
Andrew Bartlett
commit b47f9a09cd5c374b213d9bad83c4903130f61a42
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 16:51:47 2012 +1000
s3-param: Rename lp_dns_proxy() -> lp_wins_dns_proxy() for clarity
This avoids some confusion now we have a DNS server as well.
Andrew Bartlett
commit 38b1a1115491f9bdbcf3dde42798fa94bd39dd97
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 16:51:15 2012 +1000
lib/param: Import s3 parameters into lib/param to allow the parameter lists merge
This will allow us to create just one list of the FN_ macros, included
into both parameter systems.
This will in turn allow the actual parameter definitions
to be merged in a similar way.
Andrew Bartlett
commit 89981c7b17f84cb8d6b8bf0271a2f2869f3a3a99
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 16:34:14 2012 +1000
lib/param: Mark a few more parameters const (matching s3)
While this makes no difference in the lib/param code, this allows the C files
to be compared and merged.
Andrew Bartlett
commit f0d53009383ed9055f8daaf2f589e8c32cdeb3d8
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 16:26:11 2012 +1000
param: mark realm parameter as const
commit b225248486dfbee5bb9b6536ed4f822b2af8f894
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 15:17:44 2012 +1000
param: Sort global param functions macros to ease the s3/s4 merge
This makes it easier to them merge these two function lists without
changing the meaning of the output.
Andrew Bartlett
commit ec14445b1cf79d5750e757a3eeaf42117dd8465a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 14:55:39 2012 +1000
lib/param: Add .flags to max/min protocol to match s3
This reduces the difference in the parameter tables.
Andrew Bartlett
commit 073a3705f23ca46092caec310d44394dd8d38b3b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 14:53:26 2012 +1000
lib/param: Add .flags to wins parameters to match s3
This reduces the difference in the parameter tables.
Andrew Bartlett
commit d3f061b687ca2a22956e1132a395239928f9c9f8
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 14:47:28 2012 +1000
lib/param: Harmonise 'password server' parameter between s3 and s4
commit 91e4983d306aacbdfe2097fc8d9e60cb367989bb
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 22 11:56:50 2012 +1000
s3-build: Remove build of libtdb.so from the autoconf build
We now either link tdb statically or we use the system provided tdb
This means that we now only have one build system for externally-available
tdb, which in turn ensures we have a consistent shared library built as
libtdb.so
Andrew Bartlett
commit ac63b55033d4ba37dbbc4712fa980ac90a162e2d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 22 11:55:49 2012 +1000
s3-build: Remove build of libtalloc.so from the autoconf build
We now either link talloc statically or we use the system provided talloc
This means that we now only have one build system for externally-available
talloc, which in turn ensures we have a consistent shared library built as
libtalloc.so
Andrew Bartlett
commit 53d4ffcc227cd2d3a998718faeeeca0d1431e54b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 12:13:14 2012 +1000
s3-iconv: Remove unused script/gen-8bit-gap.sh
We decided to rely on a system iconv rather than these
modules.
Andrew Bartlett
commit c691ada7096a9c5c6c95de390329ebb16e2086c5
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 12:50:34 2012 +1000
build: Provide .pc file for libsmbsharemodes
This is not the exact same file as the autoconf build, because of
the differnet processing semantics.
Andrew Bartlett
commit 3ef62345abe8321a141831ab9d8cda4d096407b0
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 12:50:05 2012 +1000
build: Provide .pc file for libnetapi
This is not the exact same file as the autoconf build, because of
the differnet processing semantics.
Andrew Bartlett
commit 8ddd2a869b76b6fc298f1d08dbf496b3431ddce4
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 29 18:56:56 2012 +1000
build: Remove unused release scripts for tevent
These now use waf dist, and the script/librelease.sh script as a wrapper.
The mksyms.sh call in the source3/Makefile uses the copy in source3/script
Andrew Bartlett
commit c8877d8f63ea367401fae4377cd28ee91b58d9e3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 29 18:56:36 2012 +1000
build: Remove unused release scripts for tdb
These now use waf dist, and the script/librelease.sh script as a wrapper.
The mksyms.sh call in the source3/Makefile uses the copy in source3/script
Andrew Bartlett
commit ccb7642e5bc128c201bc7cff4f2a09fce3fd0c7d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 12:15:05 2012 +1000
build: Remove unused release scripts for talloc
These now use waf dist, and the script/librelease.sh script as a wrapper.
The mksyms.sh call in the source3/Makefile uses the copy in source3/script
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
.../{maxprotocol.xml => servermaxprotocol.xml} | 6 +-
.../{minprotocol.xml => serverminprotocol.xml} | 5 +-
lib/param/loadparm.c | 119 ++-------
lib/param/param_functions.c | 250 ++++++++++++++++++
lib/param/wscript_build | 12 +-
lib/talloc/script/abi_checks.sh | 80 ------
lib/talloc/script/abi_checks_gcc.sh | 34 ---
lib/talloc/script/mksigs.pl | 199 --------------
lib/talloc/script/mksyms.awk | 75 ------
lib/talloc/script/mksyms.sh | 62 -----
lib/talloc/script/release-script.sh | 68 -----
lib/tdb/script/abi_checks.sh | 91 -------
lib/tdb/script/abi_checks_gcc.sh | 35 ---
lib/tdb/script/mksigs.pl | 183 -------------
lib/tdb/script/mksyms.awk | 76 ------
lib/tdb/script/mksyms.sh | 45 ----
lib/tdb/script/release-script.sh | 67 -----
lib/tevent/script/abi_checks.sh | 91 -------
lib/tevent/script/abi_checks_gcc.sh | 31 ---
lib/tevent/script/mksigs.pl | 183 -------------
lib/tevent/script/mksyms.awk | 76 ------
lib/tevent/script/mksyms.sh | 45 ----
source3/Makefile.in | 147 +----------
source3/autogen.sh | 8 +-
source3/configure.in | 12 +-
source3/include/proto.h | 4 +-
.../smbclient.pc.in => libnet/netapi.pc.in} | 6 +-
.../{smbclient.pc.in => smbsharemodes.pc.in} | 6 +-
source3/nmbd/nmbd.c | 2 +-
source3/nmbd/nmbd_winsserver.c | 2 +-
source3/param/loadparm.c | 279 ++------------------
source3/param/loadparm_ctx.c | 2 +
source3/script/gap.awk | 39 ---
source3/script/gaptab.awk | 48 ----
source3/script/gen-8bit-gap.awk | 18 --
source3/script/gen-8bit-gap.sh.in | 48 ----
source3/smbd/process.c | 2 +-
source3/wscript_build | 8 +-
38 files changed, 344 insertions(+), 2120 deletions(-)
rename docs-xml/smbdotconf/protocol/{maxprotocol.xml => servermaxprotocol.xml} (94%)
rename docs-xml/smbdotconf/protocol/{minprotocol.xml => serverminprotocol.xml} (89%)
delete mode 100755 lib/talloc/script/abi_checks.sh
delete mode 100755 lib/talloc/script/abi_checks_gcc.sh
delete mode 100755 lib/talloc/script/mksigs.pl
delete mode 100644 lib/talloc/script/mksyms.awk
delete mode 100755 lib/talloc/script/mksyms.sh
delete mode 100755 lib/talloc/script/release-script.sh
delete mode 100755 lib/tdb/script/abi_checks.sh
delete mode 100755 lib/tdb/script/abi_checks_gcc.sh
delete mode 100755 lib/tdb/script/mksigs.pl
delete mode 100644 lib/tdb/script/mksyms.awk
delete mode 100755 lib/tdb/script/mksyms.sh
delete mode 100755 lib/tdb/script/release-script.sh
delete mode 100755 lib/tevent/script/abi_checks.sh
delete mode 100755 lib/tevent/script/abi_checks_gcc.sh
delete mode 100755 lib/tevent/script/mksigs.pl
delete mode 100644 lib/tevent/script/mksyms.awk
delete mode 100755 lib/tevent/script/mksyms.sh
copy source3/{libsmb/smbclient.pc.in => libnet/netapi.pc.in} (59%)
copy source3/libsmb/{smbclient.pc.in => smbsharemodes.pc.in} (62%)
delete mode 100644 source3/script/gap.awk
delete mode 100644 source3/script/gaptab.awk
delete mode 100644 source3/script/gen-8bit-gap.awk
delete mode 100755 source3/script/gen-8bit-gap.sh.in
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/protocol/maxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
similarity index 94%
rename from docs-xml/smbdotconf/protocol/maxprotocol.xml
rename to docs-xml/smbdotconf/protocol/servermaxprotocol.xml
index 2ecf846..459bce8 100644
--- a/docs-xml/smbdotconf/protocol/maxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
@@ -1,4 +1,4 @@
-<samba:parameter name="max protocol"
+<samba:parameter name="server max protocol"
context="G"
type="enum"
developer="1"
@@ -59,8 +59,8 @@
the appropriate protocol.</para>
</description>
-<related>min protocol</related>
-<synonym>protocol</synonym>
+<related>server min protocol</related>
+<synonym>max protocol</synonym>
<value type="default">SMB2</value>
<value type="example">LANMAN1</value>
diff --git a/docs-xml/smbdotconf/protocol/minprotocol.xml b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
similarity index 89%
rename from docs-xml/smbdotconf/protocol/minprotocol.xml
rename to docs-xml/smbdotconf/protocol/serverminprotocol.xml
index 0bec282..1fbb7dc 100644
--- a/docs-xml/smbdotconf/protocol/minprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
@@ -1,4 +1,4 @@
-<samba:parameter name="min protocol"
+<samba:parameter name="server min protocol"
context="G"
type="string"
developer="1"
@@ -17,6 +17,9 @@
to change this parameter.</para>
</description>
+<related>server min protocol</related>
+<synonym>min protocol</synonym>
+
<value type="default">CORE</value>
<value type="example">NT1</value>
</samba:parameter>
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index d68d585..520fc94 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -334,9 +334,9 @@ static struct parm_struct parm_table[] = {
},
{
.label = "password server",
- .type = P_LIST,
+ .type = P_STRING,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szPasswordServers),
+ .offset = GLOBAL_VAR(szPasswordServer),
.special = NULL,
.enum_list = NULL
},
@@ -622,7 +622,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(srv_maxprotocol),
.special = NULL,
- .enum_list = enum_protocol
+ .enum_list = enum_protocol,
+ .flags = FLAG_ADVANCED,
},
{
.label = "max protocol",
@@ -630,7 +631,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(srv_maxprotocol),
.special = NULL,
- .enum_list = enum_protocol
+ .enum_list = enum_protocol,
+ .flags = FLAG_ADVANCED,
},
{
.label = "protocol",
@@ -647,7 +649,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(srv_minprotocol),
.special = NULL,
- .enum_list = enum_protocol
+ .enum_list = enum_protocol,
+ .flags = FLAG_ADVANCED,
},
{
.label = "min protocol",
@@ -655,7 +658,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(srv_minprotocol),
.special = NULL,
- .enum_list = enum_protocol
+ .enum_list = enum_protocol,
+ .flags = FLAG_ADVANCED,
},
{
.label = "client max protocol",
@@ -991,7 +995,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szWINSservers),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "wins support",
@@ -999,7 +1004,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bWINSsupport),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "wins hook",
@@ -1525,100 +1531,17 @@ static struct loadparm_context *global_loadparm_context;
#include "lib/param/param_functions.c"
-FN_GLOBAL_LIST(smb_ports, smb_ports)
-FN_GLOBAL_INTEGER(nbt_port, nbt_port)
-FN_GLOBAL_INTEGER(dgram_port, dgram_port)
-FN_GLOBAL_INTEGER(cldap_port, cldap_port)
-FN_GLOBAL_INTEGER(krb5_port, krb5_port)
-FN_GLOBAL_INTEGER(kpasswd_port, kpasswd_port)
-FN_GLOBAL_INTEGER(web_port, web_port)
-FN_GLOBAL_BOOL(tls_enabled, tls_enabled)
-FN_GLOBAL_STRING(logfile, logfile)
-FN_GLOBAL_STRING(share_backend, szShareBackend)
-FN_GLOBAL_CONST_STRING(winbind_separator, szWinbindSeparator)
-FN_GLOBAL_CONST_STRING(winbindd_socket_directory, szWinbinddSocketDirectory)
-FN_GLOBAL_CONST_STRING(winbindd_privileged_socket_directory, szWinbinddPrivilegedSocketDirectory)
-FN_GLOBAL_CONST_STRING(template_shell, szTemplateShell)
-FN_GLOBAL_CONST_STRING(template_homedir, szTemplateHomedir)
-FN_GLOBAL_BOOL(winbind_sealed_pipes, bWinbindSealedPipes)
+/* These functions remain only in lib/param for now */
FN_GLOBAL_BOOL(idmap_trusted_only, bIdmapTrustedOnly)
-FN_GLOBAL_STRING(private_dir, szPrivateDir)
-FN_GLOBAL_STRING(serverstring, szServerString)
-FN_GLOBAL_STRING(lockdir, szLockDir)
-FN_GLOBAL_STRING(statedir, szStateDir)
-FN_GLOBAL_STRING(cachedir, szCacheDir)
-FN_GLOBAL_STRING(ncalrpc_dir, ncalrpc_dir)
-FN_GLOBAL_STRING(dos_charset, dos_charset)
-FN_GLOBAL_STRING(unix_charset, unix_charset)
-FN_GLOBAL_STRING(piddir, szPidDir)
-FN_GLOBAL_LIST(rndc_command, szRNDCCommand)
-FN_GLOBAL_LIST(dns_update_command, szDNSUpdateCommand)
-FN_GLOBAL_LIST(spn_update_command, szSPNUpdateCommand)
-FN_GLOBAL_LIST(samba_kcc_command, szSambaKCCCommand)
-FN_GLOBAL_LIST(nsupdate_command, szNSUpdateCommand)
-FN_GLOBAL_LIST(dcerpc_endpoint_servers, dcerpc_ep_servers)
-FN_GLOBAL_LIST(server_services, server_services)
-FN_GLOBAL_STRING(ntptr_providor, ntptr_providor)
-FN_GLOBAL_STRING(passdb_backend, passdb_backend)
-FN_GLOBAL_STRING(auto_services, szAutoServices)
-FN_GLOBAL_STRING(passwd_chat, szPasswdChat)
-FN_GLOBAL_LIST(passwordserver, szPasswordServers)
-FN_GLOBAL_LIST(name_resolve_order, szNameResolveOrder)
-FN_GLOBAL_STRING(realm, szRealm_upper)
-FN_GLOBAL_STRING(dnsdomain, szRealm_lower)
-FN_GLOBAL_STRING(socket_options, socket_options)
-FN_GLOBAL_STRING(workgroup, szWorkgroup)
-FN_GLOBAL_STRING(netbios_name, szNetbiosName)
-FN_GLOBAL_STRING(netbios_scope, szNetbiosScope)
-FN_GLOBAL_LIST(wins_server_list, szWINSservers)
-FN_GLOBAL_LIST(interfaces, szInterfaces)
-FN_GLOBAL_STRING(socket_address, szSocketAddress)
-FN_GLOBAL_LIST(netbios_aliases, szNetbiosAliases)
-FN_GLOBAL_BOOL(disable_netbios, bDisableNetbios)
-FN_GLOBAL_BOOL(we_are_a_wins_server, bWINSsupport)
-FN_GLOBAL_BOOL(wins_dns_proxy, bWINSdnsProxy)
-FN_GLOBAL_STRING(wins_hook, szWINSHook)
-FN_GLOBAL_BOOL(local_master, bLocalMaster)
FN_GLOBAL_BOOL(readraw, bReadRaw)
-FN_GLOBAL_BOOL(large_readwrite, bLargeReadwrite)
-FN_GLOBAL_BOOL(writeraw, bWriteRaw)
-FN_GLOBAL_BOOL(null_passwords, bNullPasswords)
-FN_GLOBAL_BOOL(obey_pam_restrictions, bObeyPamRestrictions)
-FN_GLOBAL_BOOL(encrypted_passwords, bEncryptPasswords)
FN_GLOBAL_BOOL(time_server, bTimeServer)
-FN_GLOBAL_BOOL(bind_interfaces_only, bBindInterfacesOnly)
FN_GLOBAL_BOOL(unicode, bUnicode)
-FN_GLOBAL_BOOL(nt_status_support, bNTStatusSupport)
-FN_GLOBAL_BOOL(lanman_auth, bLanmanAuth)
-FN_GLOBAL_BOOL(ntlm_auth, bNTLMAuth)
-FN_GLOBAL_BOOL(client_plaintext_auth, bClientPlaintextAuth)
-FN_GLOBAL_BOOL(client_lanman_auth, bClientLanManAuth)
-FN_GLOBAL_BOOL(client_ntlmv2_auth, bClientNTLMv2Auth)
-FN_GLOBAL_BOOL(client_use_spnego_principal, client_use_spnego_principal)
-FN_GLOBAL_BOOL(host_msdfs, bHostMSDfs)
-FN_GLOBAL_BOOL(unix_extensions, bUnixExtensions)
-FN_GLOBAL_BOOL(use_spnego, bUseSpnego)
-FN_GLOBAL_BOOL(use_mmap, bUseMmap)
-FN_GLOBAL_BOOL(rpc_big_endian, bRpcBigEndian)
-FN_GLOBAL_INTEGER(max_wins_ttl, max_wins_ttl)
-FN_GLOBAL_INTEGER(min_wins_ttl, min_wins_ttl)
-FN_GLOBAL_INTEGER(maxmux, max_mux)
-FN_GLOBAL_INTEGER(max_xmit, max_xmit)
-FN_GLOBAL_INTEGER(passwordlevel, pwordlevel)
-FN_GLOBAL_INTEGER(srv_maxprotocol, srv_maxprotocol)
-FN_GLOBAL_INTEGER(srv_minprotocol, srv_minprotocol)
-FN_GLOBAL_INTEGER(cli_maxprotocol, cli_maxprotocol)
-FN_GLOBAL_INTEGER(cli_minprotocol, cli_minprotocol)
-FN_GLOBAL_BOOL(paranoid_server_security, paranoid_server_security)
-
-FN_GLOBAL_INTEGER(allow_dns_updates, allow_dns_updates)
-FN_GLOBAL_CONST_STRING(dns_forwarder, dns_forwarder)
-FN_GLOBAL_BOOL(dns_recursive_queries, dns_recursive_queries)
-
-FN_GLOBAL_INTEGER(server_signing, server_signing)
-FN_GLOBAL_INTEGER(client_signing, client_signing)
-
-FN_GLOBAL_CONST_STRING(ntp_signd_socket_directory, szNTPSignDSocketDirectory)
+FN_GLOBAL_BOOL(writeraw, bWriteRaw)
+FN_GLOBAL_LIST(name_resolve_order, szNameResolveOrder)
+FN_GLOBAL_LIST(smb_ports, smb_ports)
+FN_GLOBAL_STRING(cachedir, szCacheDir)
+FN_GLOBAL_STRING(socket_address, szSocketAddress)
+FN_GLOBAL_STRING(statedir, szStateDir)
/* local prototypes */
static int map_parameter(const char *pszParmName);
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index cd85cb0..a13ae02 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -157,3 +157,253 @@ FN_LOCAL_CHAR(magicchar, magic_char)
FN_LOCAL_STRING(cups_options, szCupsOptions)
FN_LOCAL_PARM_BOOL(change_notify, bChangeNotify)
FN_LOCAL_PARM_BOOL(kernel_change_notify, bKernelChangeNotify)
+
+FN_GLOBAL_BOOL(allow_insecure_widelinks, bAllowInsecureWidelinks)
+FN_GLOBAL_BOOL(allow_trusted_domains, bAllowTrustedDomains)
+FN_GLOBAL_BOOL(async_smb_echo_handler, bAsyncSMBEchoHandler)
+FN_GLOBAL_BOOL(bind_interfaces_only, bBindInterfacesOnly)
+FN_GLOBAL_BOOL(browse_list, bBrowseList)
+FN_GLOBAL_BOOL(client_lanman_auth, bClientLanManAuth)
+FN_GLOBAL_BOOL(client_ntlmv2_auth, bClientNTLMv2Auth)
+FN_GLOBAL_BOOL(client_plaintext_auth, bClientPlaintextAuth)
+FN_GLOBAL_BOOL(client_use_spnego, bClientUseSpnego)
+FN_GLOBAL_BOOL(client_use_spnego_principal, client_use_spnego_principal)
+FN_GLOBAL_BOOL(clustering, clustering)
+FN_GLOBAL_BOOL(create_krb5_conf, bCreateKrb5Conf)
+FN_GLOBAL_BOOL(debug_class, bDebugClass)
+FN_GLOBAL_BOOL(debug_hires_timestamp, bDebugHiresTimestamp)
+FN_GLOBAL_BOOL(debug_pid, bDebugPid)
+FN_GLOBAL_BOOL(debug_prefix_timestamp, bDebugPrefixTimestamp)
+FN_GLOBAL_BOOL(debug_uid, bDebugUid)
+FN_GLOBAL_BOOL(defer_sharing_violations, bDeferSharingViolations)
+FN_GLOBAL_BOOL(disable_netbios, bDisableNetbios)
+FN_GLOBAL_BOOL(_disable_spoolss, bDisableSpoolss)
+FN_GLOBAL_BOOL(dns_recursive_queries, dns_recursive_queries)
+FN_GLOBAL_BOOL(enable_asu_support, bASUSupport)
+FN_GLOBAL_BOOL(enable_core_files, bEnableCoreFiles)
+FN_GLOBAL_BOOL(enable_privileges, bEnablePrivileges)
+FN_GLOBAL_BOOL(encrypted_passwords, bEncryptPasswords)
+FN_GLOBAL_BOOL(enhanced_browsing, enhanced_browsing)
+FN_GLOBAL_BOOL(getwd_cache, getwd_cache)
+FN_GLOBAL_BOOL(host_msdfs, bHostMSDfs)
+FN_GLOBAL_BOOL(hostname_lookups, bHostnameLookups)
+FN_GLOBAL_BOOL(lanman_auth, bLanmanAuth)
+FN_GLOBAL_BOOL(large_readwrite, bLargeReadwrite)
+FN_GLOBAL_BOOL(ldap_delete_dn, ldap_delete_dn)
+FN_GLOBAL_BOOL(ldap_ssl_ads, ldap_ssl_ads)
+FN_GLOBAL_BOOL(load_printers, bLoadPrinters)
+FN_GLOBAL_BOOL(local_master, bLocalMaster)
+FN_GLOBAL_BOOL(log_writeable_files_on_exit, bLogWriteableFilesOnExit)
+FN_GLOBAL_BOOL(map_untrusted_to_domain, bMapUntrustedToDomain)
+FN_GLOBAL_BOOL(ms_add_printer_wizard, bMsAddPrinterWizard)
+FN_GLOBAL_BOOL(multicast_dns_register, bMulticastDnsRegister)
+FN_GLOBAL_BOOL(nis_home_map, bNISHomeMap)
+FN_GLOBAL_BOOL(nmbd_bind_explicit_broadcast, bNmbdBindExplicitBroadcast)
+FN_GLOBAL_BOOL(ntlm_auth, bNTLMAuth)
+FN_GLOBAL_BOOL(nt_pipe_support, bNTPipeSupport)
+FN_GLOBAL_BOOL(nt_status_support, bNTStatusSupport)
+FN_GLOBAL_BOOL(null_passwords, bNullPasswords)
+FN_GLOBAL_BOOL(obey_pam_restrictions, bObeyPamRestrictions)
+FN_GLOBAL_BOOL(pam_password_change, bPamPasswordChange)
+FN_GLOBAL_BOOL(paranoid_server_security, paranoid_server_security)
+FN_GLOBAL_BOOL(passdb_expand_explicit, bPassdbExpandExplicit)
+FN_GLOBAL_BOOL(passwd_chat_debug, bPasswdChatDebug)
+FN_GLOBAL_BOOL(registry_shares, bRegistryShares)
+FN_GLOBAL_BOOL(reset_on_zero_vc, bResetOnZeroVC)
+FN_GLOBAL_BOOL(rpc_big_endian, bRpcBigEndian)
+FN_GLOBAL_BOOL(stat_cache, bStatCache)
+FN_GLOBAL_BOOL(syslog_only, bSyslogOnly)
+FN_GLOBAL_BOOL(timestamp_logs, bTimestampLogs)
+FN_GLOBAL_BOOL(tls_enabled, tls_enabled)
+FN_GLOBAL_BOOL(unix_extensions, bUnixExtensions)
+FN_GLOBAL_BOOL(unix_password_sync, bUnixPasswdSync)
+FN_GLOBAL_BOOL(use_mmap, bUseMmap)
+FN_GLOBAL_BOOL(usershare_allow_guests, bUsershareAllowGuests)
+FN_GLOBAL_BOOL(usershare_owner_only, bUsershareOwnerOnly)
+FN_GLOBAL_BOOL(use_spnego, bUseSpnego)
+FN_GLOBAL_BOOL(utmp, bUtmp)
+FN_GLOBAL_BOOL(we_are_a_wins_server, bWINSsupport)
+FN_GLOBAL_BOOL(winbind_enum_groups, bWinbindEnumGroups)
+FN_GLOBAL_BOOL(winbind_enum_users, bWinbindEnumUsers)
+FN_GLOBAL_BOOL(winbind_nested_groups, bWinbindNestedGroups)
+FN_GLOBAL_BOOL(winbind_normalize_names, bWinbindNormalizeNames)
+FN_GLOBAL_BOOL(winbind_offline_logon, bWinbindOfflineLogon)
+FN_GLOBAL_BOOL(winbind_refresh_tickets, bWinbindRefreshTickets)
+FN_GLOBAL_BOOL(winbind_rpc_only, bWinbindRpcOnly)
+FN_GLOBAL_BOOL(winbind_sealed_pipes, bWinbindSealedPipes)
+FN_GLOBAL_BOOL(winbind_trusted_domains_only, bWinbindTrustedDomainsOnly)
+FN_GLOBAL_BOOL(winbind_use_default_domain, bWinbindUseDefaultDomain)
+FN_GLOBAL_BOOL(wins_dns_proxy, bWINSdnsProxy)
+FN_GLOBAL_BOOL(wins_proxy, bWINSproxy)
+FN_GLOBAL_CONST_STRING(afs_username_map, szAfsUsernameMap)
+FN_GLOBAL_CONST_STRING(dedicated_keytab_file, szDedicatedKeytabFile)
+FN_GLOBAL_CONST_STRING(dnsdomain, szRealm_lower)
+FN_GLOBAL_CONST_STRING(dns_forwarder, dns_forwarder)
+FN_GLOBAL_CONST_STRING(dos_charset, dos_charset)
+FN_GLOBAL_CONST_STRING(guestaccount, szGuestaccount)
+FN_GLOBAL_CONST_STRING(idmap_backend, szIdmapBackend)
+FN_GLOBAL_CONST_STRING(lockdir, szLockDir)
+FN_GLOBAL_CONST_STRING(logon_drive, szLogonDrive)
+FN_GLOBAL_CONST_STRING(logon_home, szLogonHome)
+FN_GLOBAL_CONST_STRING(logon_path, szLogonPath)
+FN_GLOBAL_CONST_STRING(logon_script, szLogonScript)
+FN_GLOBAL_CONST_STRING(ncalrpc_dir, ncalrpc_dir)
+FN_GLOBAL_CONST_STRING(netbios_name, szNetbiosName)
+FN_GLOBAL_CONST_STRING(netbios_scope, szNetbiosScope)
+FN_GLOBAL_CONST_STRING(ntp_signd_socket_directory, szNTPSignDSocketDirectory)
+FN_GLOBAL_CONST_STRING(passdb_backend, passdb_backend)
+FN_GLOBAL_CONST_STRING(passwordserver, szPasswordServer)
+FN_GLOBAL_CONST_STRING(piddir, szPidDir)
+FN_GLOBAL_CONST_STRING(private_dir, szPrivateDir)
+FN_GLOBAL_CONST_STRING(realm, szRealm_upper)
+FN_GLOBAL_CONST_STRING(smb_passwd_file, szSMBPasswdFile)
+FN_GLOBAL_CONST_STRING(socket_options, socket_options)
+FN_GLOBAL_CONST_STRING(template_homedir, szTemplateHomedir)
+FN_GLOBAL_CONST_STRING(template_shell, szTemplateShell)
+FN_GLOBAL_CONST_STRING(unix_charset, unix_charset)
+FN_GLOBAL_CONST_STRING(utmpdir, szUtmpDir)
+FN_GLOBAL_CONST_STRING(winbindd_privileged_socket_directory, szWinbinddPrivilegedSocketDirectory)
+FN_GLOBAL_CONST_STRING(winbindd_socket_directory, szWinbinddSocketDirectory)
+FN_GLOBAL_CONST_STRING(winbind_separator, szWinbindSeparator)
+FN_GLOBAL_CONST_STRING(workgroup, szWorkgroup)
+FN_GLOBAL_CONST_STRING(wtmpdir, szWtmpDir)
+FN_GLOBAL_INTEGER(acl_compatibility, iAclCompat)
+FN_GLOBAL_INTEGER(afs_token_lifetime, iAfsTokenLifetime)
+FN_GLOBAL_INTEGER(algorithmic_rid_base, AlgorithmicRidBase)
+FN_GLOBAL_INTEGER(allow_dns_updates, allow_dns_updates)
+FN_GLOBAL_INTEGER(cldap_port, cldap_port)
+FN_GLOBAL_INTEGER(client_ldap_sasl_wrapping, client_ldap_sasl_wrapping)
+FN_GLOBAL_INTEGER(client_schannel, clientSchannel)
+FN_GLOBAL_INTEGER(client_signing, client_signing)
+FN_GLOBAL_INTEGER(cli_maxprotocol, cli_maxprotocol)
+FN_GLOBAL_INTEGER(cli_minprotocol, cli_minprotocol)
+FN_GLOBAL_INTEGER(config_backend, ConfigBackend)
+FN_GLOBAL_INTEGER(ctdb_locktime_warn_threshold, ctdb_locktime_warn_threshold)
+FN_GLOBAL_INTEGER(ctdb_timeout, ctdb_timeout)
+FN_GLOBAL_INTEGER(cups_connection_timeout, cups_connection_timeout)
+FN_GLOBAL_INTEGER(deadtime, deadtime)
+FN_GLOBAL_INTEGER(dgram_port, dgram_port)
+FN_GLOBAL_INTEGER(idmap_cache_time, iIdmapCacheTime)
+FN_GLOBAL_INTEGER(idmap_negative_cache_time, iIdmapNegativeCacheTime)
+FN_GLOBAL_INTEGER(init_logon_delay, InitLogonDelay)
+FN_GLOBAL_INTEGER(keepalive, iKeepalive)
+FN_GLOBAL_INTEGER(kerberos_method, iKerberosMethod)
+FN_GLOBAL_INTEGER(kpasswd_port, kpasswd_port)
+FN_GLOBAL_INTEGER(krb5_port, krb5_port)
+FN_GLOBAL_INTEGER(ldap_connection_timeout, ldap_connection_timeout)
+FN_GLOBAL_INTEGER(ldap_debug_level, ldap_debug_level)
+FN_GLOBAL_INTEGER(ldap_debug_threshold, ldap_debug_threshold)
+FN_GLOBAL_INTEGER(ldap_deref, ldap_deref)
+FN_GLOBAL_INTEGER(ldap_follow_referral, ldap_follow_referral)
+FN_GLOBAL_INTEGER(ldap_page_size, ldap_page_size)
+FN_GLOBAL_INTEGER(ldap_passwd_sync, ldap_passwd_sync)
+FN_GLOBAL_INTEGER(ldap_replication_sleep, ldap_replication_sleep)
+FN_GLOBAL_INTEGER(ldap_ssl, ldap_ssl)
+FN_GLOBAL_INTEGER(ldap_timeout, ldap_timeout)
+FN_GLOBAL_INTEGER(lm_announce, lm_announce)
+FN_GLOBAL_INTEGER(lm_interval, lm_interval)
+FN_GLOBAL_INTEGER(lock_spin_time, iLockSpinTime)
+FN_GLOBAL_INTEGER(lpqcachetime, lpqcachetime)
+FN_GLOBAL_INTEGER(machine_password_timeout, machine_password_timeout)
+FN_GLOBAL_INTEGER(mangle_prefix, mangle_prefix)
+FN_GLOBAL_INTEGER(map_to_guest, map_to_guest)
+FN_GLOBAL_INTEGER(maxdisksize, maxdisksize)
+FN_GLOBAL_INTEGER(max_log_size, max_log_size)
+FN_GLOBAL_INTEGER(maxmux, max_mux)
+FN_GLOBAL_INTEGER(max_open_files, max_open_files)
+FN_GLOBAL_INTEGER(max_smbd_processes, iMaxSmbdProcesses)
+FN_GLOBAL_INTEGER(max_stat_cache_size, iMaxStatCacheSize)
+FN_GLOBAL_INTEGER(max_ttl, max_ttl)
+FN_GLOBAL_INTEGER(max_wins_ttl, max_wins_ttl)
+FN_GLOBAL_INTEGER(max_xmit, max_xmit)
+FN_GLOBAL_INTEGER(min_wins_ttl, min_wins_ttl)
+FN_GLOBAL_INTEGER(name_cache_timeout, name_cache_timeout)
+FN_GLOBAL_INTEGER(nbt_port, nbt_port)
+FN_GLOBAL_INTEGER(open_files_db_hash_size, open_files_db_hash_size)
+FN_GLOBAL_INTEGER(oplock_break_wait_time, oplock_break_wait_time)
+FN_GLOBAL_INTEGER(os_level, os_level)
+FN_GLOBAL_INTEGER(passwd_chat_timeout, iPasswdChatTimeout)
+FN_GLOBAL_INTEGER(passwordlevel, pwordlevel)
+FN_GLOBAL_INTEGER(printcap_cache_time, PrintcapCacheTime)
+FN_GLOBAL_INTEGER(restrict_anonymous, restrict_anonymous)
+FN_GLOBAL_INTEGER(server_schannel, serverSchannel)
+FN_GLOBAL_INTEGER(server_signing, server_signing)
+FN_GLOBAL_INTEGER(smb2_max_read, ismb2_max_read)
+FN_GLOBAL_INTEGER(smb2_max_trans, ismb2_max_trans)
+FN_GLOBAL_INTEGER(smb2_max_write, ismb2_max_write)
+FN_GLOBAL_INTEGER(srv_maxprotocol, srv_maxprotocol)
+FN_GLOBAL_INTEGER(srv_minprotocol, srv_minprotocol)
+FN_GLOBAL_INTEGER(syslog, syslog)
+FN_GLOBAL_INTEGER(usernamelevel, unamelevel)
+FN_GLOBAL_INTEGER(username_map_cache_time, iUsernameMapCacheTime)
+FN_GLOBAL_INTEGER(web_port, web_port)
+FN_GLOBAL_INTEGER(winbind_cache_time, winbind_cache_time)
+FN_GLOBAL_INTEGER(winbind_expand_groups, winbind_expand_groups)
+FN_GLOBAL_INTEGER(winbind_max_clients, winbind_max_clients)
+FN_GLOBAL_INTEGER(winbind_reconnect_delay, winbind_reconnect_delay)
+FN_GLOBAL_LIST(auth_methods, AuthMethods)
+FN_GLOBAL_LIST(cluster_addresses, szClusterAddresses)
+FN_GLOBAL_LIST(dcerpc_endpoint_servers, dcerpc_ep_servers)
+FN_GLOBAL_LIST(dns_update_command, szDNSUpdateCommand)
+FN_GLOBAL_LIST(eventlog_list, szEventLogs)
+FN_GLOBAL_LIST(init_logon_delayed_hosts, szInitLogonDelayedHosts)
+FN_GLOBAL_LIST(interfaces, szInterfaces)
+FN_GLOBAL_LIST(netbios_aliases, szNetbiosAliases)
+FN_GLOBAL_LIST(nsupdate_command, szNSUpdateCommand)
+FN_GLOBAL_LIST(preload_modules, szPreloadModules)
+FN_GLOBAL_LIST(rndc_command, szRNDCCommand)
+FN_GLOBAL_LIST(samba_kcc_command, szSambaKCCCommand)
+FN_GLOBAL_LIST(server_services, server_services)
+FN_GLOBAL_LIST(spn_update_command, szSPNUpdateCommand)
+FN_GLOBAL_LIST(svcctl_list, szServicesList)
+FN_GLOBAL_LIST(usershare_prefix_allow_list, szUsersharePrefixAllowList)
+FN_GLOBAL_LIST(usershare_prefix_deny_list, szUsersharePrefixDenyList)
+FN_GLOBAL_LIST(winbind_nss_info, szWinbindNssInfo)
+FN_GLOBAL_LIST(wins_server_list, szWINSservers)
+FN_GLOBAL_STRING(abort_shutdown_script, szAbortShutdownScript)
+FN_GLOBAL_STRING(addgroup_script, szAddGroupScript)
+FN_GLOBAL_STRING(addmachine_script, szAddMachineScript)
+FN_GLOBAL_STRING(addport_cmd, szAddPortCommand)
+FN_GLOBAL_STRING(addprinter_cmd, szAddPrinterCommand)
+FN_GLOBAL_STRING(add_share_cmd, szAddShareCommand)
+FN_GLOBAL_STRING(adduser_script, szAddUserScript)
+FN_GLOBAL_STRING(addusertogroup_script, szAddUserToGroupScript)
+FN_GLOBAL_STRING(auto_services, szAutoServices)
+FN_GLOBAL_STRING(change_share_cmd, szChangeShareCommand)
+FN_GLOBAL_STRING(check_password_script, szCheckPasswordScript)
+FN_GLOBAL_STRING(cups_server, szCupsServer)
+FN_GLOBAL_STRING(defaultservice, szDefaultService)
+FN_GLOBAL_STRING(deleteprinter_cmd, szDeletePrinterCommand)
+FN_GLOBAL_STRING(delete_share_cmd, szDeleteShareCommand)
+FN_GLOBAL_STRING(delgroup_script, szDelGroupScript)
+FN_GLOBAL_STRING(deluserfromgroup_script, szDelUserFromGroupScript)
+FN_GLOBAL_STRING(deluser_script, szDelUserScript)
+FN_GLOBAL_STRING(enumports_cmd, szEnumPortsCommand)
+FN_GLOBAL_STRING(get_quota_command, szGetQuota)
+FN_GLOBAL_STRING(iprint_server, szIPrintServer)
+FN_GLOBAL_STRING(ldap_admin_dn, szLdapAdminDn)
+FN_GLOBAL_STRING(ldap_suffix, szLdapSuffix)
+FN_GLOBAL_STRING(logfile, logfile)
+FN_GLOBAL_STRING(log_nt_token_command, szLogNtTokenCommand)
+FN_GLOBAL_STRING(mangling_method, szManglingMethod)
+FN_GLOBAL_STRING(msg_command, szMsgCommand)
+FN_GLOBAL_STRING(nis_home_map_name, szNISHomeMapName)
+FN_GLOBAL_STRING(ntptr_providor, ntptr_providor)
+FN_GLOBAL_STRING(os2_driver_map, szOs2DriverMap)
+FN_GLOBAL_STRING(panic_action, szPanicAction)
+FN_GLOBAL_STRING(passwd_chat, szPasswdChat)
+FN_GLOBAL_STRING(passwd_program, szPasswdProgram)
+FN_GLOBAL_STRING(perfcount_module, szSMBPerfcountModule)
+FN_GLOBAL_STRING(remote_announce, szRemoteAnnounce)
+FN_GLOBAL_STRING(remote_browse_sync, szRemoteBrowseSync)
+FN_GLOBAL_STRING(renameuser_script, szRenameUserScript)
+FN_GLOBAL_STRING(rootdir, szRootdir)
+FN_GLOBAL_STRING(serverstring, szServerString)
+FN_GLOBAL_STRING(setprimarygroup_script, szSetPrimaryGroupScript)
+FN_GLOBAL_STRING(set_quota_command, szSetQuota)
+FN_GLOBAL_STRING(share_backend, szShareBackend)
+FN_GLOBAL_STRING(shutdown_script, szShutdownScript)
+FN_GLOBAL_STRING(username_map_script, szUsernameMapScript)
+FN_GLOBAL_STRING(username_map, szUsernameMap)
+FN_GLOBAL_STRING(usershare_path, szUsersharePath)
+FN_GLOBAL_STRING(wins_hook, szWINSHook)
diff --git a/lib/param/wscript_build b/lib/param/wscript_build
index 13b7709..10e05a3 100644
--- a/lib/param/wscript_build
+++ b/lib/param/wscript_build
@@ -1,20 +1,20 @@
#!/usr/bin/env python
bld.SAMBA_GENERATOR('param_local_h',
- source= 'param_functions.c ../../script/mkparamdefs.pl',
+ source= '../../script/mkparamdefs.pl param_functions.c ',
target='param_local.h',
--
Samba Shared Repository
More information about the samba-cvs
mailing list