diff options
| author | Jeremy Allison <jra@samba.org> | 2003-08-27 01:25:01 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-08-27 01:25:01 +0000 |
| commit | 9fdc1363bec6ae9a0a0f9a37130b98a92ebe8ce2 (patch) | |
| tree | a3f5b31cb23487dab3c01bb3eeb1a65c5a675afe /source3/param/loadparm.c | |
| parent | 7e27147422e78125c2bb5b8115bd9084a657e084 (diff) | |
| download | samba-9fdc1363bec6ae9a0a0f9a37130b98a92ebe8ce2.tar.gz samba-9fdc1363bec6ae9a0a0f9a37130b98a92ebe8ce2.tar.bz2 samba-9fdc1363bec6ae9a0a0f9a37130b98a92ebe8ce2.zip | |
Fix the character set handling properly in nmbd. Also fix bug where
iconv wasn't re-initialised on reading of "charset" parameters. This
caused workgroup name to be set incorrectly if it contained an
extended character.
Jeremy.
(This used to be commit 84ae44678a6c59c999bc1023fdd9b7ad87f4ec18)
Diffstat (limited to 'source3/param/loadparm.c')
| -rw-r--r-- | source3/param/loadparm.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index c0d0e501f3..5d67ae9169 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -563,6 +563,7 @@ static BOOL handle_debug_list( const char *pszParmValue, char **ptr ); static BOOL handle_workgroup( const char *pszParmValue, char **ptr ); static BOOL handle_netbios_aliases( const char *pszParmValue, char **ptr ); static BOOL handle_netbios_scope( const char *pszParmValue, char **ptr ); +static BOOL handle_charset( const char *pszParmValue, char **ptr ); static BOOL handle_ldap_suffix ( const char *pszParmValue, char **ptr ); static BOOL handle_ldap_sub_suffix ( const char *pszParmValue, char **ptr ); @@ -753,9 +754,9 @@ static const struct enum_list enum_map_to_guest[] = { static struct parm_struct parm_table[] = { {"Base Options", P_SEP, P_SEPARATOR}, - {"dos charset", P_STRING, P_GLOBAL, &Globals.dos_charset, NULL, NULL, FLAG_ADVANCED}, - {"unix charset", P_STRING, P_GLOBAL, &Globals.unix_charset, NULL, NULL, FLAG_ADVANCED}, - {"display charset", P_STRING, P_GLOBAL, &Globals.display_charset, NULL, NULL, FLAG_ADVANCED}, + {"dos charset", P_STRING, P_GLOBAL, &Globals.dos_charset, handle_charset, NULL, FLAG_ADVANCED}, + {"unix charset", P_STRING, P_GLOBAL, &Globals.unix_charset, handle_charset, NULL, FLAG_ADVANCED}, + {"display charset", P_STRING, P_GLOBAL, &Globals.display_charset, handle_charset, NULL, FLAG_ADVANCED}, {"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT}, {"path", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT}, {"directory", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_HIDE}, @@ -2701,7 +2702,6 @@ static BOOL handle_netbios_name(const char *pszParmValue, char **ptr) standard_sub_basic(current_user_info.smb_name, netbios_name,sizeof(netbios_name)); - ret = set_global_myname(netbios_name); string_set(&Globals.szNetbiosName,global_myname()); @@ -2711,6 +2711,13 @@ static BOOL handle_netbios_name(const char *pszParmValue, char **ptr) return ret; } +static BOOL handle_charset(const char *pszParmValue, char **ptr) +{ + string_set(ptr, pszParmValue); + init_iconv(); + return True; +} + static BOOL handle_workgroup(const char *pszParmValue, char **ptr) { BOOL ret; |