The branch, master has been updated
via 280d187 lib/param: Rename param_enums.c to param_table.c
via b94ab3c lib/param: Remove 'case insensitive filesystem'
via 8b1a9f3 lib/param: Remove "ntptr providor" and hard-code in s4
spoolss server
via 01f25ad s3-param: Merge parameter varaibles with lib/param
via 7881f4a s3-param: fix indent on cups encrypt
via 2daf120 s3-param: Merge a number of s4 parameters from lib/param to
make this table common
via 80d3208 param: Make internal handler for 'server role' common
via 9521cd0 param: Make the 'unicode' parameter common
from 69e98ff Remove unused variable.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 280d1877fdc9c481f1cfc6e62c74ed398da97d01
Author: Andrew Bartlett <abart...@samba.org>
Date: Mon Jul 23 12:35:02 2012 +1000
lib/param: Rename param_enums.c to param_table.c
This is in preperation for the parameter table being merged into this file.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett <abart...@samba.org>
Autobuild-Date(master): Tue Jul 24 09:16:44 CEST 2012 on sn-devel-104
commit b94ab3c608eea4eaaad3762ac64995929a354173
Author: Andrew Bartlett <abart...@samba.org>
Date: Mon Jul 23 12:24:42 2012 +1000
lib/param: Remove 'case insensitive filesystem'
We use the slightly confusing 'case sensitive = yes' option for the same
behaviour.
This avoids adding even more confusing documentation for the ntvfs-only
option.
Andrew Bartlett
commit 8b1a9f3ebd48757e66f6aefc5840986bec223de9
Author: Andrew Bartlett <abart...@samba.org>
Date: Mon Jul 23 12:01:41 2012 +1000
lib/param: Remove "ntptr providor" and hard-code in s4 spoolss server
This stub codebase does not justify a merged parameter.
Andrew Bartlett
Pair-Programmed-With: Andrew Tridgell <tri...@samba.org>
commit 01f25adb5aa5e37ba4c14d1e9df8d21c131bb67f
Author: Andrew Bartlett <abart...@samba.org>
Date: Mon Jul 23 11:43:54 2012 +1000
s3-param: Merge parameter varaibles with lib/param
Baded on an earlier patch:
Pair-Programmed-With: Andrew Tridgell <tri...@samba.org>
commit 7881f4adc5081e206a2bde709c0725b27277ba73
Author: Andrew Bartlett <abart...@samba.org>
Date: Mon Jul 23 11:42:40 2012 +1000
s3-param: fix indent on cups encrypt
commit 2daf1204c67fe66298a5606aa8eb99227e738b33
Author: Andrew Bartlett <abart...@samba.org>
Date: Mon Jul 23 11:40:21 2012 +1000
s3-param: Merge a number of s4 parameters from lib/param to make this table
common
This is not finished yet, but this is a downpayment on the final task.
Based on an work that that was
Pair-Programmed-With: Andrew Tridgell <tri...@samba.org>
Andrew Bartlett
commit 80d3208830744f02bba5581938c9e27f473d15b9
Author: Andrew Bartlett <abart...@samba.org>
Date: Mon Jul 23 11:38:25 2012 +1000
param: Make internal handler for 'server role' common
commit 9521cd0409add2628352ee5ef888c5a8a90fbb27
Author: Andrew Bartlett <abart...@samba.org>
Date: Mon Jul 23 09:14:39 2012 +1000
param: Make the 'unicode' parameter common
This parameter is most useful for interop testing, rather than production
use.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
lib/param/loadparm.c | 21 +--
lib/param/param_functions.c | 4 +-
lib/param/{param_enums.c => param_table.c} | 0
source3/include/proto.h | 1 +
source3/libsmb/clientgen.c | 3 +
source3/param/loadparm.c | 336 +++++++++++++++++++++++++--
source3/smbd/negprot.c | 6 +-
source4/param/share_classic.c | 27 ++-
source4/rpc_server/spoolss/dcesrv_spoolss.c | 2 +-
9 files changed, 350 insertions(+), 50 deletions(-)
rename lib/param/{param_enums.c => param_table.c} (100%)
Changeset truncated at 500 lines:
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 33aef24..e744e79 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -83,7 +83,6 @@ static bool defaults_saved = false;
char *tls_dhpfile; \
char *loglevel; \
char *panic_action; \
- int server_role; \
int security; \
int domain_master; \
int domain_logons; \
@@ -106,7 +105,7 @@ static bool handle_debuglevel(struct loadparm_context
*lp_ctx, int unused,
static bool handle_logfile(struct loadparm_context *lp_ctx, int unused,
const char *pszParmValue, char **ptr);
-#include "lib/param/param_enums.c"
+#include "lib/param/param_table.c"
#define GLOBAL_VAR(name) offsetof(struct loadparm_global, name)
#define LOCAL_VAR(name) offsetof(struct loadparm_service, name)
@@ -267,14 +266,6 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL
},
{
- .label = "ntptr providor",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(ntptr_providor),
- .special = NULL,
- .enum_list = NULL
- },
- {
.label = "passdb backend",
.type = P_STRING,
.p_class = P_GLOBAL,
@@ -860,14 +851,6 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
- {
- .label = "case insensitive filesystem",
- .type = P_BOOL,
- .p_class = P_LOCAL,
- .offset = LOCAL_VAR(bCIFileSystem),
- .special = NULL,
- .enum_list = NULL
- },
{
.label = "max print jobs",
@@ -1524,7 +1507,6 @@ static struct loadparm_context *global_loadparm_context;
/* These functions remain only in lib/param for now */
FN_GLOBAL_BOOL(readraw, bReadRaw)
-FN_GLOBAL_BOOL(unicode, bUnicode)
FN_GLOBAL_BOOL(writeraw, bWriteRaw)
FN_GLOBAL_STRING(cachedir, szCacheDir)
FN_GLOBAL_STRING(socket_address, szSocketAddress)
@@ -3301,7 +3283,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX
*mem_ctx)
lpcfg_do_global_parameter(lp_ctx, "dcerpc endpoint servers", "epmapper
wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi dssetup unixinfo browser
eventlog6 backupkey dnsserver");
lpcfg_do_global_parameter(lp_ctx, "server services", "s3fs rpc nbt
wrepl ldap cldap kdc drepl winbind ntp_signd kcc dnsupdate");
- lpcfg_do_global_parameter(lp_ctx, "ntptr providor", "simple_ldb");
/* the winbind method for domain controllers is for both RODC
auth forwarding and for trusted domains */
lpcfg_do_global_parameter(lp_ctx, "private dir", dyn_PRIVATE_DIR);
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index eb75f7d..3a0ac75 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -40,7 +40,6 @@ FN_LOCAL_BOOL(map_hidden, bMap_hidden)
FN_LOCAL_BOOL(map_archive, bMap_archive)
FN_LOCAL_BOOL(oplocks, bOpLocks)
FN_LOCAL_BOOL(strict_sync, bStrictSync)
-FN_LOCAL_BOOL(ci_filesystem, bCIFileSystem)
FN_LOCAL_BOOL(map_system, bMap_system)
FN_LOCAL_INTEGER(max_connections, iMaxConnections)
FN_LOCAL_INTEGER(csc_policy, iCSCPolicy)
@@ -211,11 +210,13 @@ 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(_server_role, server_role)
FN_GLOBAL_BOOL(stat_cache, bStatCache)
FN_GLOBAL_BOOL(syslog_only, bSyslogOnly)
FN_GLOBAL_BOOL(timestamp_logs, bTimestampLogs)
FN_GLOBAL_BOOL(time_server, bTimeServer)
FN_GLOBAL_BOOL(tls_enabled, tls_enabled)
+FN_GLOBAL_BOOL(unicode, bUnicode)
FN_GLOBAL_BOOL(unix_extensions, bUnixExtensions)
FN_GLOBAL_BOOL(unix_password_sync, bUnixPasswdSync)
FN_GLOBAL_BOOL(use_mmap, bUseMmap)
@@ -392,7 +393,6 @@ 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)
diff --git a/lib/param/param_enums.c b/lib/param/param_table.c
similarity index 100%
rename from lib/param/param_enums.c
rename to lib/param/param_table.c
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 3a2bf1b..ddccbb7 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1163,6 +1163,7 @@ bool lp_host_msdfs(void);
bool lp_enhanced_browsing(void);
bool lp_use_mmap(void);
bool lp_unix_extensions(void);
+bool lp_unicode(void);
bool lp_use_spnego(void);
bool lp_client_use_spnego(void);
bool lp_client_use_spnego_principal(void);
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index dcb8467..88cb44d 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -191,6 +191,9 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
if (getenv("CLI_FORCE_ASCII")) {
force_ascii = true;
}
+ if (!lp_unicode()) {
+ force_ascii = true;
+ }
if (flags & CLI_FULL_CONNECTION_FORCE_ASCII) {
force_ascii = true;
}
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2a9900b..a116531 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -114,12 +114,12 @@ static bool defaults_saved = false;
#define LOADPARM_EXTRA_GLOBALS \
struct parmlist_entry *param_opt; \
char *szRealm; \
- char *szLogLevel; \
+ char *loglevel; \
int iminreceivefile; \
char *szPrintcapname; \
int CupsEncrypt; \
int iPreferredMaster; \
- int iDomainMaster; \
+ int domain_master; \
char *szLdapMachineSuffix; \
char *szLdapUserSuffix; \
char *szLdapIdmapSuffix; \
@@ -131,7 +131,14 @@ static bool defaults_saved = false;
char *szIdmapUID; \
char *szIdmapGID; \
int winbindMaxDomainConnections; \
- int ismb2_max_credits;
+ int ismb2_max_credits; \
+ char *tls_keyfile; \
+ char *tls_certfile; \
+ char *tls_cafile; \
+ char *tls_crlfile; \
+ char *tls_dhpfile; \
+ char *panic_action; \
+ int bPreferredMaster;
#include "param/param_global.h"
@@ -317,7 +324,7 @@ static void add_to_file_list(const char *fname, const char
*subfname);
static bool lp_set_cmdline_helper(const char *pszParmName, const char
*pszParmValue, bool store_values);
static void free_param_opts(struct parmlist_entry **popts);
-#include "lib/param/param_enums.c"
+#include "lib/param/param_table.c"
static const struct enum_list enum_printing[] = {
{PRINT_SYSV, "sysv"},
@@ -472,6 +479,7 @@ static const struct enum_list enum_kerberos_method[] = {
#define GLOBAL_VAR(name) offsetof(struct loadparm_global, name)
#define LOCAL_VAR(name) offsetof(struct loadparm_service, name)
+
static struct parm_struct parm_table[] = {
{N_("Base Options"), P_SEP, P_SEPARATOR},
@@ -605,7 +613,7 @@ static struct parm_struct parm_table[] = {
.label = "server role",
.type = P_ENUM,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(ServerRole),
+ .offset = GLOBAL_VAR(server_role),
.special = NULL,
.enum_list = enum_server_role,
.flags = FLAG_BASIC | FLAG_ADVANCED,
@@ -1370,7 +1378,7 @@ static struct parm_struct parm_table[] = {
.label = "log level",
.type = P_STRING,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szLogLevel),
+ .offset = GLOBAL_VAR(loglevel),
.special = handle_debug_list,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
@@ -1379,7 +1387,7 @@ static struct parm_struct parm_table[] = {
.label = "debuglevel",
.type = P_STRING,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szLogLevel),
+ .offset = GLOBAL_VAR(loglevel),
.special = handle_debug_list,
.enum_list = NULL,
.flags = FLAG_HIDE,
@@ -1595,6 +1603,32 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
{
+ .label = "client max protocol",
+ .type = P_ENUM,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(cli_maxprotocol),
+ .special = NULL,
+ .enum_list = enum_protocol,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "client min protocol",
+ .type = P_ENUM,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(cli_minprotocol),
+ .special = NULL,
+ .enum_list = enum_protocol,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "unicode",
+ .type = P_BOOL,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(bUnicode),
+ .special = NULL,
+ .enum_list = NULL
+ },
+ {
.label = "min receivefile size",
.type = P_BYTES,
.p_class = P_GLOBAL,
@@ -1873,6 +1907,62 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
+ {
+ .label = "cldap port",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(cldap_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 = "nbt port",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(nbt_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 = "rpc big endian",
+ .type = P_BOOL,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(bRpcBigEndian),
+ .special = NULL,
+ .enum_list = NULL
+ },
{N_("Tuning Options"), P_SEP, P_SEPARATOR},
@@ -2279,7 +2369,7 @@ static struct parm_struct parm_table[] = {
.label = "cups encrypt",
.type = P_ENUM,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(CupsEncrypt),
+ .offset = GLOBAL_VAR(CupsEncrypt),
.special = NULL,
.enum_list = enum_bool_auto,
.flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2982,7 +3072,7 @@ static struct parm_struct parm_table[] = {
.label = "domain master",
.type = P_ENUM,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(iDomainMaster),
+ .offset = GLOBAL_VAR(domain_master),
.special = NULL,
.enum_list = enum_bool_auto,
.flags = FLAG_BASIC | FLAG_ADVANCED,
@@ -3479,6 +3569,16 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
+ {
+ .label = "ntp signd socket directory",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szNTPSignDSocketDirectory),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+
#ifdef WITH_UTMP
{
.label = "utmp directory",
@@ -3959,15 +4059,6 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
{
- .label = "multicast dns register",
- .type = P_BOOL,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bMulticastDnsRegister),
- .special = NULL,
- .enum_list = NULL,
- .flags = FLAG_ADVANCED | FLAG_GLOBAL,
- },
- {
.label = "panic action",
.type = P_STRING,
.p_class = P_GLOBAL,
@@ -4292,6 +4383,201 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
+ {
+ .label = "winbindd socket directory",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szWinbinddSocketDirectory),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "winbindd privileged socket directory",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset =
GLOBAL_VAR(szWinbinddPrivilegedSocketDirectory),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "winbind sealed pipes",
+ .type = P_BOOL,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(bWinbindSealedPipes),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+
+ {N_("DNS options"), P_SEP, P_SEPARATOR},
+ {
+ .label = "allow dns updates",
+ .type = P_ENUM,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(allow_dns_updates),
+ .special = NULL,
+ .enum_list = enum_dns_update_settings,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "dns forwarder",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(dns_forwarder),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "dns recursive queries",
+ .type = P_BOOL,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(dns_recursive_queries),
+ .special = NULL,
+ .enum_list = NULL
+ },
+ {
+ .label = "dns update command",
+ .type = P_CMDLIST,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szDNSUpdateCommand),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "nsupdate command",
+ .type = P_CMDLIST,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szNSUpdateCommand),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "rndc command",
+ .type = P_CMDLIST,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szRNDCCommand),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "multicast dns register",
+ .type = P_BOOL,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(bMulticastDnsRegister),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_GLOBAL,
+ },
+
+ {N_("AD DC options"), P_SEP, P_SEPARATOR},
+
+ {
+ .label = "samba kcc command",
+ .type = P_CMDLIST,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szSambaKCCCommand),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "server services",
+ .type = P_LIST,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(server_services),
+ .special = NULL,
+ .enum_list = NULL
+ },
+ {
+ .label = "dcerpc endpoint servers",
+ .type = P_LIST,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(dcerpc_ep_servers),
+ .special = NULL,
+ .enum_list = NULL
+ },
+ {
+ .label = "spn update command",
+ .type = P_CMDLIST,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szSPNUpdateCommand),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "share backend",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szShareBackend),
+ .special = NULL,
+ .enum_list = NULL
+ },
+ {
+ .label = "ntvfs handler",
+ .type = P_LIST,
--
Samba Shared Repository
