diff options
Diffstat (limited to 'source3/smbd/mangle.c')
| -rw-r--r-- | source3/smbd/mangle.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/source3/smbd/mangle.c b/source3/smbd/mangle.c index 392e48afc1..20b2b419cf 100644 --- a/source3/smbd/mangle.c +++ b/source3/smbd/mangle.c @@ -29,7 +29,6 @@ static struct { } mangle_backends[] = { { "hash", mangle_hash_init }, { "hash2", mangle_hash2_init }, - /*{ "tdb", mangle_tdb_init }, */ { NULL, NULL } }; @@ -41,12 +40,11 @@ static void mangle_init(void) int i; char *method; - if (mangle_fns) - return; + if (mangle_fns) return; method = lp_mangling_method(); - /* find the first mangling method that manages to initialise and + /* find the first mangling method that manages to initialise and matches the "mangling method" parameter */ for (i=0; mangle_backends[i].name && !mangle_fns; i++) { if (!method || !*method || strcmp(method, mangle_backends[i].name) == 0) { @@ -84,12 +82,7 @@ BOOL mangle_is_mangled(const char *s) */ BOOL mangle_is_8_3(const char *fname, BOOL check_case) { - return mangle_fns->is_8_3(fname, check_case, False); -} - -BOOL mangle_is_8_3_wildcards(const char *fname, BOOL check_case) -{ - return mangle_fns->is_8_3(fname, check_case, True); + return mangle_fns->is_8_3(fname, check_case); } /* @@ -106,8 +99,7 @@ BOOL mangle_check_cache(char *s) /* map a long filename to a 8.3 name. */ - -void mangle_map(char *OutName, BOOL need83, BOOL cache83, int snum) +BOOL mangle_map(char *OutName, BOOL need83, BOOL cache83, int snum) { /* name mangling can be disabled for speed, in which case we just truncate the string */ @@ -115,10 +107,11 @@ void mangle_map(char *OutName, BOOL need83, BOOL cache83, int snum) if (need83) { string_truncate(OutName, 12); } - return; + return True; } /* invoke the inane "mangled map" code */ mangle_map_filename(OutName, snum); - mangle_fns->name_map(OutName, need83, cache83); + + return mangle_fns->name_map(OutName, need83, cache83); } |