summaryrefslogtreecommitdiff
path: root/source3/smbd/filename.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-07-22 13:39:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:15 -0500
commit0c6d7f28d6c1066cc6b3055ebf6a8fcf685ca1f6 (patch)
treeaab81a105d51d7985421a12bb0496f35a4dc3a26 /source3/smbd/filename.c
parentd810ffe58e9c6b3b71336f59b899012af9137fe7 (diff)
downloadsamba-0c6d7f28d6c1066cc6b3055ebf6a8fcf685ca1f6.tar.gz
samba-0c6d7f28d6c1066cc6b3055ebf6a8fcf685ca1f6.tar.bz2
samba-0c6d7f28d6c1066cc6b3055ebf6a8fcf685ca1f6.zip
r1570: merging changes from 3.0.5
(This used to be commit 430cf63b9148441bce42bfb15a8045de5da108f4)
Diffstat (limited to 'source3/smbd/filename.c')
-rw-r--r--source3/smbd/filename.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index ab75d9c06a..cc1c0a40b6 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -326,7 +326,7 @@ BOOL unix_convert(pstring name,connection_struct *conn,char *saved_last_componen
*/
if (mangle_is_mangled(start)) {
- mangle_check_cache( start );
+ mangle_check_cache( start, sizeof(pstring) - 1 - (start - name) );
}
DEBUG(5,("New file %s\n",start));
@@ -476,7 +476,7 @@ static BOOL scan_directory(const char *path, char *name, size_t maxlength,
* (JRA).
*/
if (mangled)
- mangled = !mangle_check_cache( name );
+ mangled = !mangle_check_cache( name, maxlength );
/* open the directory */
if (!(cur_dir = OpenDir(conn, path, True))) {