diff options
Diffstat (limited to 'source3/smbd/trans2.c')
| -rw-r--r-- | source3/smbd/trans2.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index ca8ad5fa79..1972e9c8c8 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -475,7 +475,7 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn, if(!(got_match = *got_exact_match = exact_match(fname, mask, case_sensitive))) got_match = mask_match(fname, mask, case_sensitive); - if(!got_match && !is_8_3(fname, False)) { + if(!got_match && !mangle_is_8_3(fname, False)) { /* * It turns out that NT matches wildcards against @@ -486,7 +486,7 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn, pstring newname; pstrcpy( newname, fname); - name_map_mangle( newname, True, False, SNUM(conn)); + mangle_map( newname, True, False, SNUM(conn)); if(!(got_match = *got_exact_match = exact_match(newname, mask, case_sensitive))) got_match = mask_match(newname, mask, case_sensitive); } @@ -549,7 +549,7 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn, } } - name_map_mangle(fname,False,True,SNUM(conn)); + mangle_map(fname,False,True,SNUM(conn)); p = pdata; nameptr = p; @@ -597,7 +597,7 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn, break; case SMB_FIND_FILE_BOTH_DIRECTORY_INFO: - was_8_3 = is_8_3(fname, True); + was_8_3 = mangle_is_8_3(fname, True); p += 4; SIVAL(p,0,reskey); p += 4; put_long_date(p,cdate); p += 8; @@ -613,7 +613,7 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn, if (!was_8_3) { pstring mangled_name; pstrcpy(mangled_name, fname); - name_map_mangle(mangled_name,True,True,SNUM(conn)); + mangle_map(mangled_name,True,True,SNUM(conn)); mangled_name[12] = 0; len = srvstr_push(outbuf, p+2, mangled_name, 24, STR_UPPER); SSVAL(p, 0, len); @@ -997,8 +997,8 @@ static int call_trans2findfirst(connection_struct *conn, * (see PR#13758). JRA. */ - if(!is_8_3( mask, False)) - name_map_mangle(mask, True, True, SNUM(conn)); + if(!mangle_is_8_3( mask, False)) + mangle_map(mask, True, True, SNUM(conn)); return(-1); } @@ -1142,14 +1142,14 @@ resume_key = %d resume name = %s continue=%d level = %d\n", dname = ReadDirName(dirptr); /* - * Remember, name_map_mangle is called by + * Remember, mangle_map is called by * get_lanman2_dir_entry(), so the resume name * could be mangled. Ensure we do the same * here. */ if(dname != NULL) - name_map_mangle( dname, False, True, SNUM(conn)); + mangle_map( dname, False, True, SNUM(conn)); if(dname && strcsequal( resume_name, dname)) { @@ -1170,14 +1170,14 @@ resume_key = %d resume name = %s continue=%d level = %d\n", for(current_pos = start_pos; (dname = ReadDirName(dirptr)) != NULL; SeekDir(dirptr,++current_pos)) { /* - * Remember, name_map_mangle is called by + * Remember, mangle_map is called by * get_lanman2_dir_entry(), so the resume name * could be mangled. Ensure we do the same * here. */ if(dname != NULL) - name_map_mangle( dname, False, True, SNUM(conn)); + mangle_map( dname, False, True, SNUM(conn)); if(dname && strcsequal( resume_name, dname)) { @@ -1657,8 +1657,8 @@ static int call_trans2qfilepathinfo(connection_struct *conn, pstrcpy(short_name,base_name); /* Mangle if not already 8.3 */ - if(!is_8_3(short_name, True)) { - if(!name_map_mangle(short_name,True,True,SNUM(conn))) + if(!mangle_is_8_3(short_name, True)) { + if(!mangle_map(short_name,True,True,SNUM(conn))) *short_name = '\0'; } len = srvstr_push(outbuf, pdata+4, short_name, -1, STR_TERMINATE|STR_UPPER); |