summaryrefslogtreecommitdiff
path: root/source3/smbd/filename.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-05-06 08:07:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:47 -0500
commit02e3717ee9e045d197d845489e84ac40083ca868 (patch)
treedddd1100fcec3249f31741b8564d635396873775 /source3/smbd/filename.c
parent61ffe158f2d3f149b230cc31c4b58d7d025ab28d (diff)
downloadsamba-02e3717ee9e045d197d845489e84ac40083ca868.tar.gz
samba-02e3717ee9e045d197d845489e84ac40083ca868.tar.bz2
samba-02e3717ee9e045d197d845489e84ac40083ca868.zip
r6625: Remove another global variable left over from a long time ago (magic char).
Jeremy. (This used to be commit b1bfa9cb37deb22d1d08bc60ba44d61334f6446e)
Diffstat (limited to 'source3/smbd/filename.c')
-rw-r--r--source3/smbd/filename.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 9ca2c0efae..5f3cdfb77e 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -150,7 +150,7 @@ BOOL unix_convert(pstring name,connection_struct *conn,char *saved_last_componen
pstrcpy(saved_last_component, name);
}
- if (!conn->case_preserve || (mangle_is_8_3(name, False) && !conn->short_case_preserve))
+ if (!conn->case_preserve || (mangle_is_8_3(name, False, SNUM(conn)) && !conn->short_case_preserve))
strnorm(name, lp_defaultcase(SNUM(conn)));
start = name;
@@ -179,7 +179,7 @@ BOOL unix_convert(pstring name,connection_struct *conn,char *saved_last_componen
* sensitive then searching won't help.
*/
- if (conn->case_sensitive && !mangle_is_mangled(name) && !*lp_mangled_map(SNUM(conn)))
+ if (conn->case_sensitive && !mangle_is_mangled(name, SNUM(conn)) && !*lp_mangled_map(SNUM(conn)))
return(False);
name_has_wildcard = ms_has_wild(start);
@@ -189,7 +189,7 @@ BOOL unix_convert(pstring name,connection_struct *conn,char *saved_last_componen
* just a component. JRA.
*/
- if (mangle_is_mangled(start))
+ if (mangle_is_mangled(start, SNUM(conn)))
component_was_mangled = True;
/*
@@ -317,7 +317,7 @@ BOOL unix_convert(pstring name,connection_struct *conn,char *saved_last_componen
* base of the filename.
*/
- if (mangle_is_mangled(start)) {
+ if (mangle_is_mangled(start, SNUM(conn))) {
mangle_check_cache( start, sizeof(pstring) - 1 - (start - name) );
}
@@ -433,7 +433,7 @@ static BOOL scan_directory(connection_struct *conn, const char *path, char *name
BOOL mangled;
long curpos;
- mangled = mangle_is_mangled(name);
+ mangled = mangle_is_mangled(name, SNUM(conn));
/* handle null paths */
if (*path == 0)