diff options
| author | Tim Potter <tpot@samba.org> | 2000-12-01 01:14:55 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2000-12-01 01:14:55 +0000 |
| commit | 7d7c9a2f794ab587c56be08b6900e9887d3fa0c3 (patch) | |
| tree | af1dd5d13697337fb8f550ab616097cf8e1c4b95 | |
| parent | 36390f729360bec7ad3ef6413b2245b0c2e420ce (diff) | |
| download | samba-7d7c9a2f794ab587c56be08b6900e9887d3fa0c3.tar.gz samba-7d7c9a2f794ab587c56be08b6900e9887d3fa0c3.tar.bz2 samba-7d7c9a2f794ab587c56be08b6900e9887d3fa0c3.zip | |
Use lp_codepagedir() instead of CODEPAGEDIR when loading the unicode map.
Found by Joseph Cheek <joseph@cheek.com>
(This used to be commit ec74fdc631fbd5f0b5450df02acb9cd98c153823)
| -rw-r--r-- | source3/lib/util_unistr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c index ad387b4e9d..74ecc841d0 100644 --- a/source3/lib/util_unistr.c +++ b/source3/lib/util_unistr.c @@ -547,12 +547,13 @@ BOOL load_unicode_map(const char *codepage, smb_ucs2_t **pp_cp_to_ucs2, uint16 * if (*codepage == '\0') goto clean_and_exit; - if(strlen(CODEPAGEDIR) + 13 + strlen(codepage) > sizeof(unicode_map_file_name)) { + if(strlen(lp_codepagedir()) + 13 + strlen(codepage) > + sizeof(unicode_map_file_name)) { DEBUG(0,("load_unicode_map: filename too long to load\n")); goto clean_and_exit; } - pstrcpy(unicode_map_file_name, CODEPAGEDIR); + pstrcpy(unicode_map_file_name, lp_codepagedir()); pstrcat(unicode_map_file_name, "/"); pstrcat(unicode_map_file_name, "unicode_map."); pstrcat(unicode_map_file_name, codepage); |