diff options
| author | Andrew Tridgell <tridge@samba.org> | 2002-04-11 02:20:56 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2002-04-11 02:20:56 +0000 |
| commit | 9cd0306baa1b3a78b40ab97b5d199b90a4c34aa6 (patch) | |
| tree | de86987bf008f56bc1e4130add688bce45d11cf9 /source3/smbd/dir.c | |
| parent | d3fa6d5de64f022eafd99b83d4853c86f8b2f46c (diff) | |
| download | samba-9cd0306baa1b3a78b40ab97b5d199b90a4c34aa6.tar.gz samba-9cd0306baa1b3a78b40ab97b5d199b90a4c34aa6.tar.bz2 samba-9cd0306baa1b3a78b40ab97b5d199b90a4c34aa6.zip | |
This split the mangling code up to allow for the possibility of multiple
mangling implementation, selectable using "mangling method = " in smb.conf
It also tidies the interface a little, although it is still nasty.
(This used to be commit be23d87a178e7d0691e7d942adf89bb3d2d533c2)
Diffstat (limited to 'source3/smbd/dir.c')
| -rw-r--r-- | source3/smbd/dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 0bf234dd3e..f56e0e9ef0 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -603,14 +603,14 @@ BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype,char *fname, */ if ((strcmp(mask,"*.*") == 0) || mask_match(filename,mask,False) || - (name_map_mangle(filename,True,False,SNUM(conn)) && + (mangle_map(filename,True,False,SNUM(conn)) && mask_match(filename,mask,False))) { if (isrootdir && (strequal(filename,"..") || strequal(filename,"."))) continue; - if (!is_8_3(filename, False)) { - name_map_mangle(filename,True,False,SNUM(conn)); + if (!mangle_is_8_3(filename, False)) { + mangle_map(filename,True,False,SNUM(conn)); } pstrcpy(fname,filename); |