Use lp_codepagedir() instead of CODEPAGEDIR when loading the unicode map.

Found by Joseph Cheek <joseph@cheek.com>
(This used to be commit ec74fdc631fbd5f0b5450df02acb9cd98c153823)

diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index ad387b4e9d470d7a6627bea3c9247f760ea6c331..74ecc841d007d46a57a4db89ed670d44ddbfd571 100644 (file)
--- 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);