summaryrefslogtreecommitdiff
path: root/lib/util
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-07 13:13:44 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-07 13:22:02 +1100
commit1867a6033ca22da715017df005a5ad61c66e1597 (patch)
treead364c75dbd9760ce38eb6fd3e50451254cdee56 /lib/util
parent1f533bff17ade8c625a87504787dee6207f272e2 (diff)
downloadsamba-1867a6033ca22da715017df005a5ad61c66e1597.tar.gz
samba-1867a6033ca22da715017df005a5ad61c66e1597.tar.bz2
samba-1867a6033ca22da715017df005a5ad61c66e1597.zip
s4-charset: use dyn_CODEPAGEDIR for location of upcase.dat/lowcase.dat
this matches samba3 behaviour Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/charset/codepoints.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/lib/util/charset/codepoints.c b/lib/util/charset/codepoints.c
index 8be20512af..bc39f1b1a4 100644
--- a/lib/util/charset/codepoints.c
+++ b/lib/util/charset/codepoints.c
@@ -44,22 +44,14 @@ void load_case_tables(void)
if (!mem_ctx) {
smb_panic("No memory for case_tables");
}
- upcase_table = map_file(talloc_asprintf(mem_ctx, "%s/upcase.dat", dyn_DATADIR), 0x20000);
- lowcase_table = map_file(talloc_asprintf(mem_ctx, "%s/lowcase.dat", dyn_DATADIR), 0x20000);
+ upcase_table = map_file(talloc_asprintf(mem_ctx, "%s/upcase.dat", dyn_CODEPAGEDIR), 0x20000);
+ lowcase_table = map_file(talloc_asprintf(mem_ctx, "%s/lowcase.dat", dyn_CODEPAGEDIR), 0x20000);
talloc_free(mem_ctx);
if (upcase_table == NULL) {
- /* try also under codepages for testing purposes */
- upcase_table = map_file("../codepages/upcase.dat", 0x20000);
- if (upcase_table == NULL) {
- upcase_table = (void *)-1;
- }
+ upcase_table = (void *)-1;
}
if (lowcase_table == NULL) {
- /* try also under codepages for testing purposes */
- lowcase_table = map_file("../codepages/lowcase.dat", 0x20000);
- if (lowcase_table == NULL) {
- lowcase_table = (void *)-1;
- }
+ lowcase_table = (void *)-1;
}
}