diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-07 13:13:44 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-07 13:22:02 +1100 |
| commit | 1867a6033ca22da715017df005a5ad61c66e1597 (patch) | |
| tree | ad364c75dbd9760ce38eb6fd3e50451254cdee56 | |
| parent | 1f533bff17ade8c625a87504787dee6207f272e2 (diff) | |
| download | samba-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>
| -rw-r--r-- | codepages/wscript_build | 2 | ||||
| -rw-r--r-- | lib/util/charset/codepoints.c | 16 | ||||
| -rw-r--r-- | source4/dynconfig/wscript | 1 | ||||
| -rw-r--r-- | source4/smbd/server.c | 1 |
4 files changed, 7 insertions, 13 deletions
diff --git a/codepages/wscript_build b/codepages/wscript_build index 695070fe0d..12255296e4 100644 --- a/codepages/wscript_build +++ b/codepages/wscript_build @@ -1,3 +1,3 @@ #!/usr/bin/env python -bld.INSTALL_WILDCARD('${DATADIR}', '*.dat') +bld.INSTALL_WILDCARD('${CODEPAGEDIR}', '*.dat') 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; } } diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript index 08621d40f1..6cebf7ee7f 100644 --- a/source4/dynconfig/wscript +++ b/source4/dynconfig/wscript @@ -126,6 +126,7 @@ def dynconfig_cflags(bld, list=None): override = { 'MODULESDIR' : 'bin/modules', 'PYTHONDIR' : 'bin/python', 'PYTHONARCHDIR' : 'bin/python', + 'CODEPAGEDIR' : os.path.join(bld.env.srcdir, 'codepages'), 'SCRIPTSBINDIR' : os.path.join(bld.env.srcdir, 'source4/scripting/bin'), 'SETUPDIR' : os.path.join(bld.env.srcdir, 'source4/setup') } for f in dyn_cflags.keys(): diff --git a/source4/smbd/server.c b/source4/smbd/server.c index 0a4e38d398..0f2f1bb1bb 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -260,6 +260,7 @@ static void show_build(void) CONFIG_OPTION(PIDDIR), CONFIG_OPTION(PRIVATE_DIR), CONFIG_OPTION(SWATDIR), + CONFIG_OPTION(CODEPAGEDIR), CONFIG_OPTION(SETUPDIR), CONFIG_OPTION(WINBINDD_SOCKET_DIR), CONFIG_OPTION(WINBINDD_PRIVILEGED_SOCKET_DIR), |