[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Thu Jul 26 21:27:02 MDT 2012
The branch, master has been updated
via ec64f79 lib/param: Mark lpcfg_cachedir and lpcfg_statedir as const char *
via ca24820 lib/param: Remove unused "paranoid server security"
via ecb89ce docs: Mark "socket address" as deprecated
via 42e405a param: Make socket_address common, Revert 611ef42053eb99f4c29d4efa86eaea9f1ca06286
via bc1826a lib/param: Merge parameter tables into a common file
via c4eeda9 lib/param: Merge in source3 parameters into parmeter table
via 081a010 lib/param: Merge "Security Options" section from source3/param
via 8cb47ef lib/param: Merge "Logging Options" section from source3/param
via 2429647 s3-param: Merge "log file" parameter with lib/param
via 08691f7 lib/param: Merge "Protocol Options" section from source3/param
via 97a6447 lib/param: Merge "Tuning Options" section from source3/param
via c5713ac lib/param: Merge "Printing Options" section from source3/param
via a943a9b s3-build: Make recursive waf build a developer build again (to build developer test facilities)
from 9b59590 s3:vlp: fix build on OS X
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ec64f7907d290276485e61b540e844bf1c839713
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jul 27 11:11:58 2012 +1000
lib/param: Mark lpcfg_cachedir and lpcfg_statedir as const char *
This matters as we sync up the declarations with the source3/param code.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Fri Jul 27 05:26:45 CEST 2012 on sn-devel-104
commit ca2482073627994d6a8c0be6dcf6463aba889635
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jul 27 10:34:05 2012 +1000
lib/param: Remove unused "paranoid server security"
This became unused when security=server went away.
Andrew Bartlett
commit ecb89cebd63ed1dcf4815a45b2a26c643c939ecb
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jul 23 13:15:23 2012 +1000
docs: Mark "socket address" as deprecated
commit 42e405a422b4913e014740678fa067d5a441db88
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jul 23 09:23:04 2012 +1000
param: Make socket_address common, Revert 611ef42053eb99f4c29d4efa86eaea9f1ca06286
This essentially reverts the commit 611ef42053eb99f4c29d4efa86eaea9f1ca06286
Author: Yasuma Takeda <yasuma at osstech.co.jp>
Date: Fri Dec 5 13:37:51 2008 -0800
Fix bug #5944 - nmbd does not boot if socket adress = "" is defined in smb.conf
Intead, the documentation is fixed so that the correct default is
recorded. Removing the special case handling here allows this to be
dealt with in the same way as all other parameters.
Andrew Bartlett
commit bc1826abd67627588f40a7fe3a0a993ab83bb65d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jul 23 13:53:16 2012 +1000
lib/param: Merge parameter tables into a common file
This file is then included into both loadparm systems.
Andrew Bartlett
Pair-Programmed-With: Andrew Tridgell <tridge at samba.org>
commit c4eeda91b0237e17cd837c8c965d381f2b3e01d6
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jul 27 09:07:19 2012 +1000
lib/param: Merge in source3 parameters into parmeter table
This finishes the series to remove the various warnings from smb.conf
loading when a source3 parameter is used.
Based on an earlier patch
Pair-Programmed-With: Andrew Tridgell <tridge at samba.org>
Andrew Bartlett
commit 081a010f8cadd5a739f432a3f9c6cdcddd0239a8
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jul 27 10:15:10 2012 +1000
lib/param: Merge "Security Options" section from source3/param
This will make the merge of the whole table smoother.
Based on an earlier patch
Pair-Programmed-With: Andrew Tridgell <tridge at samba.org>
Andrew Bartlett
commit 8cb47eff7edabcd29d1bcbbebc88ff9e528257d8
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jul 27 09:54:39 2012 +1000
lib/param: Merge "Logging Options" section from source3/param
This will make the merge of the whole table smoother.
Based on an earlier patch
Pair-Programmed-With: Andrew Tridgell <tridge at samba.org>
Andrew Bartlett
commit 24296477908b810cfe2ec6450d4b5deddc7acde6
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jul 27 10:01:44 2012 +1000
s3-param: Merge "log file" parameter with lib/param
The lib/param code uses a special handler for setting the log file.
We need to set this here, so that we can make this table common.
Andrew Bartlett
commit 08691f7eafea0c050be79bad996a6b86a8fa648f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Jul 26 16:45:59 2012 +1000
lib/param: Merge "Protocol Options" section from source3/param
This will make the merge of the whole table smoother.
Based on an earlier patch
Pair-Programmed-With: Andrew Tridgell <tridge at samba.org>
Andrew Bartlett
commit 97a6447c06e1d4c55950005e2216ff785180187b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Jul 26 16:37:21 2012 +1000
lib/param: Merge "Tuning Options" section from source3/param
This will reduced the weight of the eventual merge of all of source3/param.
Andrew Bartlett
commit c5713acf5aa0f0a2a6ba93a4ac92ee474d734ec2
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Jul 26 16:33:47 2012 +1000
lib/param: Merge "Printing Options" section from source3/param
This will reduced the weight of the eventual merge of all of source3/param.
Andrew Bartlett
commit a943a9ba2f739e8aee630f774915e8204aa8cf3a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jul 27 08:53:54 2012 +1000
s3-build: Make recursive waf build a developer build again (to build developer test facilities)
My commit f446506608ba93303b9c671bdaacd692f72bad28 was to work around the automatic ABI check
in the waf developer build. However, now that the validity of loadparm options depends on
this being a developer build, we need to change back, but disable the ABI check.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/misc/socketaddress.xml | 3 +-
lib/param/loadparm.c | 2707 +------------------
lib/param/param_functions.c | 2 +-
lib/param/param_table.c | 4117 +++++++++++++++++++++++++++
source3/Makefile-smbtorture4 | 2 +-
source3/param/loadparm.c | 4147 +---------------------------
6 files changed, 4135 insertions(+), 6843 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/misc/socketaddress.xml b/docs-xml/smbdotconf/misc/socketaddress.xml
index 17018ef..13ae11f 100644
--- a/docs-xml/smbdotconf/misc/socketaddress.xml
+++ b/docs-xml/smbdotconf/misc/socketaddress.xml
@@ -13,8 +13,9 @@
<para>By default Samba will accept connections on any
address.</para>
+ <para>This parameter is deprecated. See <smbconfoption name="bind interfaces only">Yes</smbconfoption> and <smbconfoption name="interfaces"></smbconfoption> .</para>
</description>
-<value type="default"></value>
+<value type="default">0.0.0.0</value>
<value type="example">192.168.2.20</value>
</samba:parameter>
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index c211875..2dcf06c 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -77,6 +77,9 @@ static bool defaults_saved = false;
struct parmlist_entry *param_opt; \
char *szRealm; \
char *szConfigFile; \
+ int iminreceivefile; \
+ char *szPrintcapname; \
+ int CupsEncrypt; \
int iPreferredMaster; \
char *szLdapMachineSuffix; \
char *szLdapUserSuffix; \
@@ -86,6 +89,7 @@ static bool defaults_saved = false;
char *szIdmapUID; \
char *szIdmapGID; \
int winbindMaxDomainConnections; \
+ int ismb2_max_credits; \
char *tls_keyfile; \
char *tls_certfile; \
char *tls_cafile; \
@@ -106,7 +110,6 @@ static bool defaults_saved = false;
* non-source3 code
*/
#define handle_netbios_aliases NULL
-#define handle_debug_list NULL
#define handle_printing NULL
#define handle_ldap_debug_level NULL
#define handle_idmap_backend NULL
@@ -124,2705 +127,13 @@ static bool handle_realm(struct loadparm_context *lp_ctx, int unused,
const char *pszParmValue, char **ptr);
static bool handle_copy(struct loadparm_context *lp_ctx, int unused,
const char *pszParmValue, char **ptr);
-static bool handle_debuglevel(struct loadparm_context *lp_ctx, int unused,
+static bool handle_debug_list(struct loadparm_context *lp_ctx, int unused,
const char *pszParmValue, char **ptr);
static bool handle_logfile(struct loadparm_context *lp_ctx, int unused,
const char *pszParmValue, char **ptr);
#include "lib/param/param_table.c"
-#define GLOBAL_VAR(name) offsetof(struct loadparm_global, name)
-#define LOCAL_VAR(name) offsetof(struct loadparm_service, name)
-
-static struct parm_struct parm_table[] = {
- {
- .label = "server role",
- .type = P_ENUM,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(server_role),
- .special = NULL,
- .enum_list = enum_server_role
- },
- {
- .label = "dos charset",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(dos_charset),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "unix charset",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(unix_charset),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "comment",
- .type = P_STRING,
- .p_class = P_LOCAL,
- .offset = LOCAL_VAR(comment),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT
- },
- {
- .label = "path",
- .type = P_STRING,
- .p_class = P_LOCAL,
- .offset = LOCAL_VAR(szPath),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
- },
- {
- .label = "directory",
- .type = P_STRING,
- .p_class = P_LOCAL,
- .offset = LOCAL_VAR(szPath),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_HIDE,
- },
- {
- .label = "workgroup",
- .type = P_USTRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szWorkgroup),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
- },
- {
- .label = "realm",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szRealm),
- .special = handle_realm,
- .enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
- },
- {
- .label = "netbios name",
- .type = P_USTRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szNetbiosName),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
- },
- {
- .label = "netbios aliases",
- .type = P_LIST,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szNetbiosAliases),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "netbios scope",
- .type = P_USTRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szNetbiosScope),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_ADVANCED,
- },
- {
- .label = "server string",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szServerString),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED,
- },
- {
- .label = "interfaces",
- .type = P_LIST,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szInterfaces),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
- },
- {
- .label = "bind interfaces only",
- .type = P_BOOL,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bBindInterfacesOnly),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_WIZARD,
- },
- {
- .label = "passdb backend",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(passdb_backend),
- .special = NULL,
- .enum_list = NULL
- },
-
- {
- .label = "security",
- .type = P_ENUM,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(security),
- .special = NULL,
- .enum_list = enum_security
- },
- {
- .label = "encrypt passwords",
- .type = P_BOOL,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bEncryptPasswords),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "null passwords",
- .type = P_BOOL,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bNullPasswords),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_DEPRECATED,
- },
- {
- .label = "obey pam restrictions",
- .type = P_BOOL,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bObeyPamRestrictions),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_ADVANCED,
- },
- {
- .label = "password server",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szPasswordServer),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "private dir",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szPrivateDir),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "passwd chat",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szPasswdChat),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "password level",
- .type = P_INTEGER,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(pwordlevel),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "lanman auth",
- .type = P_BOOL,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bLanmanAuth),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_ADVANCED,
- },
- {
- .label = "ntlm auth",
- .type = P_BOOL,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bNTLMAuth),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_ADVANCED,
- },
- {
- .label = "client NTLMv2 auth",
- .type = P_BOOL,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bClientNTLMv2Auth),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_ADVANCED,
- },
- {
- .label = "client lanman auth",
- .type = P_BOOL,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bClientLanManAuth),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_ADVANCED,
- },
- {
- .label = "client plaintext auth",
- .type = P_BOOL,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bClientPlaintextAuth),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_ADVANCED,
- },
- {
- .label = "client use spnego principal",
- .type = P_BOOL,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(client_use_spnego_principal),
- .special = NULL,
- .enum_list = NULL
- },
-
- {
- .label = "read only",
- .type = P_BOOL,
- .p_class = P_LOCAL,
- .offset = LOCAL_VAR(bRead_only),
- .special = NULL,
- .enum_list = NULL
- },
-
- {
- .label = "create mask",
- .type = P_OCTAL,
- .p_class = P_LOCAL,
- .offset = LOCAL_VAR(iCreate_mask),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "force create mode",
- .type = P_OCTAL,
- .p_class = P_LOCAL,
- .offset = LOCAL_VAR(iCreate_force_mode),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "directory mask",
- .type = P_OCTAL,
- .p_class = P_LOCAL,
- .offset = LOCAL_VAR(iDir_mask),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "force directory mode",
- .type = P_OCTAL,
- .p_class = P_LOCAL,
- .offset = LOCAL_VAR(iDir_force_mode),
- .special = NULL,
- .enum_list = NULL
- },
-
- {
- .label = "hosts allow",
- .type = P_LIST,
- .p_class = P_LOCAL,
- .offset = LOCAL_VAR(szHostsallow),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "hosts deny",
- .type = P_LIST,
- .p_class = P_LOCAL,
- .offset = LOCAL_VAR(szHostsdeny),
- .special = NULL,
- .enum_list = NULL
- },
-
- {
- .label = "log level",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(loglevel),
- .special = handle_debuglevel,
- .enum_list = NULL
- },
- {
- .label = "debuglevel",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(loglevel),
- .special = handle_debuglevel,
- .enum_list = NULL
- },
- {
- .label = "log file",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(logfile),
- .special = handle_logfile,
- .enum_list = NULL,
- .flags = FLAG_ADVANCED,
- },
-
- {
- .label = "smb ports",
- .type = P_LIST,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(smb_ports),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "nbt port",
- .type = P_INTEGER,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(nbt_port),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "dgram port",
- .type = P_INTEGER,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(dgram_port),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "cldap port",
- .type = P_INTEGER,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(cldap_port),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "krb5 port",
- .type = P_INTEGER,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(krb5_port),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "kpasswd port",
- .type = P_INTEGER,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(kpasswd_port),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "web port",
- .type = P_INTEGER,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(web_port),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "large readwrite",
- .type = P_BOOL,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bLargeReadwrite),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_ADVANCED,
- },
- {
- .label = "server max protocol",
- .type = P_ENUM,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(srv_maxprotocol),
- .special = NULL,
- .enum_list = enum_protocol,
- .flags = FLAG_ADVANCED,
- },
- {
- .label = "max protocol",
- .type = P_ENUM,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(srv_maxprotocol),
- .special = NULL,
- .enum_list = enum_protocol,
- .flags = FLAG_ADVANCED,
- },
- {
- .label = "protocol",
- .type = P_ENUM,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(srv_maxprotocol),
- .special = NULL,
- .enum_list = enum_protocol,
- .flags = FLAG_ADVANCED,
- },
- {
- .label = "server min protocol",
- .type = P_ENUM,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(srv_minprotocol),
- .special = NULL,
- .enum_list = enum_protocol,
- .flags = FLAG_ADVANCED,
- },
- {
- .label = "min protocol",
--
Samba Shared Repository
More information about the samba-cvs
mailing list