The Samba-Bugzilla – Attachment 6476 Details for
Bug 8150
Ban 'dos charset = utf8'
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
git-am fix for 3.6.0
0001-Fix-bug-8150-Ban-dos-charset-utf8.patch (text/plain), 2.45 KB, created by
Jeremy Allison
on 2011-05-23 17:59:53 UTC
(
hide
)
Description:
git-am fix for 3.6.0
Filename:
MIME Type:
Creator:
Jeremy Allison
Created:
2011-05-23 17:59:53 UTC
Size:
2.45 KB
patch
obsolete
>From 0f05dc416c6017bf231d28fbe1b5292aae5041f7 Mon Sep 17 00:00:00 2001 >From: Jeremy Allison <jra@samba.org> >Date: Mon, 23 May 2011 10:57:56 -0700 >Subject: [PATCH] Fix bug #8150 - Ban 'dos charset = utf8' > >--- > source3/param/loadparm.c | 40 +++++++++++++++++++++++++++++++++++++++- > 1 files changed, 39 insertions(+), 1 deletions(-) > >diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c >index 73406c1..be99759 100644 >--- a/source3/param/loadparm.c >+++ b/source3/param/loadparm.c >@@ -708,6 +708,7 @@ static bool handle_workgroup( int snum, const char *pszParmValue, char **ptr ); > static bool handle_netbios_aliases( int snum, const char *pszParmValue, char **ptr ); > static bool handle_netbios_scope( int snum, const char *pszParmValue, char **ptr ); > static bool handle_charset( int snum, const char *pszParmValue, char **ptr ); >+static bool handle_dos_charset( int snum, const char *pszParmValue, char **ptr ); > static bool handle_printing( int snum, const char *pszParmValue, char **ptr); > static bool handle_ldap_debug_level( int snum, const char *pszParmValue, char **ptr); > >@@ -955,7 +956,7 @@ static struct parm_struct parm_table[] = { > .type = P_STRING, > .p_class = P_GLOBAL, > .ptr = &Globals.dos_charset, >- .special = handle_charset, >+ .special = handle_dos_charset, > .enum_list = NULL, > .flags = FLAG_ADVANCED > }, >@@ -7531,6 +7532,43 @@ static bool handle_charset(int snum, const char *pszParmValue, char **ptr) > return True; > } > >+static bool handle_dos_charset(int snum, const char *pszParmValue, char **ptr) >+{ >+ bool is_utf8 = false; >+ size_t len = strlen(pszParmValue); >+ >+ if (len == 4 || len == 5) { >+ /* Don't use StrCaseCmp here as we don't want to >+ initialize iconv. */ >+ if ((toupper_ascii(pszParmValue[0]) == 'U') && >+ (toupper_ascii(pszParmValue[1]) == 'T') && >+ (toupper_ascii(pszParmValue[2]) == 'F')) { >+ if (len == 4) { >+ if (pszParmValue[3] == '8') { >+ is_utf8 = true; >+ } >+ } else { >+ if (pszParmValue[3] == '-' && >+ pszParmValue[4] == '8') { >+ is_utf8 = true; >+ } >+ } >+ } >+ } >+ >+ if (strcmp(*ptr, pszParmValue) != 0) { >+ if (is_utf8) { >+ DEBUG(0,("ERROR: invalid DOS charset: 'dos charset' must not " >+ "be UTF8, using (default value) %s instead.\n", >+ DEFAULT_DOS_CHARSET)); >+ pszParmValue = DEFAULT_DOS_CHARSET; >+ } >+ string_set(ptr, pszParmValue); >+ init_iconv(); >+ } >+ return True; >+} >+ > > > static bool handle_workgroup(int snum, const char *pszParmValue, char **ptr) >-- >1.7.3.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
jra
:
review?
(
abartlet
)
Actions:
View
Attachments on
bug 8150
:
6454
|
6472
| 6476