sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

param: Make the 'unicode' parameter common

Browse Source 
This parameter is most useful for interop testing, rather than production use.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2012-07-23 09:14:39 +10:00
parent 69e98ff86c
commit 9521cd0409
6 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/param/loadparm.c
View File

@ -1524,7 +1524,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)

1
lib/param/param_functions.c
View File

@ -216,6 +216,7 @@ 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)

1
source3/include/proto.h
View File

@ -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);

3
source3/libsmb/clientgen.c
View File

@ -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;
}

9
source3/param/loadparm.c
View File

@ -1594,6 +1594,14 @@ static struct parm_struct parm_table[] = {
.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,
@ -4818,6 +4826,7 @@ static void init_globals(bool reinit_globals)
#else
Globals.bUseMmap = true;
#endif
Globals.bUnicode = true;
Globals.bUnixExtensions = true;
Globals.bResetOnZeroVC = false;
Globals.bLogWriteableFilesOnExit = false;

6
source3/smbd/negprot.c
View File

@ -274,7 +274,11 @@ static void reply_nt1(struct smb_request *req, uint16 choice)
req->flags2 | FLAGS2_EXTENDED_SECURITY);
}
capabilities |= CAP_NT_SMBS|CAP_RPC_REMOTE_APIS|CAP_UNICODE;
capabilities |= CAP_NT_SMBS|CAP_RPC_REMOTE_APIS;
if (lp_unicode()) {
capabilities |= CAP_UNICODE;
}
if (lp_unix_extensions()) {
capabilities |= CAP_UNIX;