diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-03-27 05:38:20 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2004-03-27 05:38:20 +0000 |
| commit | deee8fae47be8722f737d4a2583e93f85658c126 (patch) | |
| tree | 84d20e56fe865dacae173c632f197e247a8fb5a7 | |
| parent | 651d5b4683f4c97608a5f19c9996f85ae6b21fc6 (diff) | |
| download | samba-deee8fae47be8722f737d4a2583e93f85658c126.tar.gz samba-deee8fae47be8722f737d4a2583e93f85658c126.tar.bz2 samba-deee8fae47be8722f737d4a2583e93f85658c126.zip | |
As I raised (without objection) on the mailing list a while back, this
patch removes the 'unicode' smb.conf option.
Clients are as always free not to negotiate unicode, but Samba will always
accept unicode in smbd.
Setting 'unicode = no' caused me more client BSODs than any other option
I have seen, and I really want to protect some of our more silly users, who
will, no matter what, select and change every option...
Andrew Bartlett
(This used to be commit 3f9177bd5df68809294335a36919994893ff8ead)
| -rw-r--r-- | source3/param/loadparm.c | 4 | ||||
| -rw-r--r-- | source3/smbd/negprot.c | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 35bd464b56..5313491f7e 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -280,7 +280,6 @@ typedef struct BOOL bDebugPid; BOOL bDebugUid; BOOL bHostMSDfs; - BOOL bUnicode; BOOL bUseMmap; BOOL bHostnameLookups; BOOL bUnixExtensions; @@ -880,7 +879,6 @@ static struct parm_struct parm_table[] = { {"large readwrite", P_BOOL, P_GLOBAL, &Globals.bLargeReadwrite, NULL, NULL, FLAG_ADVANCED}, {"max protocol", P_ENUM, P_GLOBAL, &Globals.maxprotocol, NULL, enum_protocol, FLAG_ADVANCED}, {"min protocol", P_ENUM, P_GLOBAL, &Globals.minprotocol, NULL, enum_protocol, FLAG_ADVANCED}, - {"unicode", P_BOOL, P_GLOBAL, &Globals.bUnicode, NULL, NULL, FLAG_ADVANCED}, {"read bmpx", P_BOOL, P_GLOBAL, &Globals.bReadbmpx, NULL, NULL, FLAG_ADVANCED}, {"read raw", P_BOOL, P_GLOBAL, &Globals.bReadRaw, NULL, NULL, FLAG_ADVANCED}, {"write raw", P_BOOL, P_GLOBAL, &Globals.bWriteRaw, NULL, NULL, FLAG_ADVANCED}, @@ -1420,7 +1418,6 @@ static void init_globals(void) Globals.bPamPasswordChange = False; Globals.bPasswdChatDebug = False; Globals.iPasswdChatTimeout = 2; /* 2 second default. */ - Globals.bUnicode = True; /* Do unicode on the wire by default */ Globals.bNTPipeSupport = True; /* Do NT pipes by default. */ Globals.bNTStatusSupport = True; /* Use NT status by default. */ Globals.bStatCache = True; /* use stat cache by default */ @@ -1735,7 +1732,6 @@ FN_GLOBAL_BOOL(lp_pam_password_change, &Globals.bPamPasswordChange) FN_GLOBAL_BOOL(lp_unix_password_sync, &Globals.bUnixPasswdSync) FN_GLOBAL_BOOL(lp_passwd_chat_debug, &Globals.bPasswdChatDebug) FN_GLOBAL_INTEGER(lp_passwd_chat_timeout, &Globals.iPasswdChatTimeout) -FN_GLOBAL_BOOL(lp_unicode, &Globals.bUnicode) FN_GLOBAL_BOOL(lp_nt_pipe_support, &Globals.bNTPipeSupport) FN_GLOBAL_BOOL(lp_nt_status_support, &Globals.bNTStatusSupport) FN_GLOBAL_BOOL(lp_stat_cache, &Globals.bStatCache) diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index 96961368fb..1843c174bb 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -251,7 +251,7 @@ static int reply_nt1(char *inbuf, char *outbuf) capabilities |= CAP_EXTENDED_SECURITY; } - capabilities |= CAP_NT_SMBS|CAP_RPC_REMOTE_APIS; + capabilities |= CAP_NT_SMBS|CAP_RPC_REMOTE_APIS|CAP_UNICODE; if (lp_unix_extensions()) { capabilities |= CAP_UNIX; @@ -266,10 +266,6 @@ static int reply_nt1(char *inbuf, char *outbuf) if (lp_readraw() && lp_writeraw()) capabilities |= CAP_RAW_MODE; - /* allow for disabling unicode */ - if (lp_unicode()) - capabilities |= CAP_UNICODE; - if (lp_nt_status_support()) capabilities |= CAP_STATUS32; |