sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

Makefile.in: Fixed make clean bug with CVS directory in bin/.

Browse Source 
include/smb.h: Fixed bugs in Debug macro's with SGI compiler.
smbd/trans2.c: Fixed bug reported by Zoltan Palmai <ZSPA@chevron.com>
               PR#8903 where get_lanman2_dir_entry() could return a
               mangled name as a resume key and call_trans2findnext()
               wasn't doing the same.
Jeremy.
This commit is contained in:
Jeremy Allison 0001-01-01 00:00:00 +00:00
parent 162141d3b3
commit 9d010e721c
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Makefile.in
View File

@ -288,7 +288,7 @@ uninstallcp:
@$(SHELL) $(srcdir)/script/uninstallcp.sh $(CODEPAGEDIR) $(CODEPAGELIST)
clean:
rm -f core */*.o */*~ *~ config.cache bin/*
rm -f core */*.o */*~ *~ config.cache bin/[!C]*
proto:
@echo rebuilding include/proto.h

4
source/include/smb.h
View File

@ -144,10 +144,10 @@ BOOL dbgtext();
#define DEBUG( level, body ) \
((DEBUGLEVEL>=(level) && \
dbghdr(level, FILE_MACRO, FUNCTION_MACRO, (__LINE__)))? \
(void)dbgtext body:0)
(void)(dbgtext body) : (void)0)
#define DEBUGADD( level, body ) \
(DEBUGLEVEL>=(level)?(void)dbgtext body:0);
(DEBUGLEVEL>=(level)?(void)(dbgtext body) : (void)0);
/* End Debugging code section.
* -------------------------------------------------------------------------- **

19
source/smbd/trans2.c
View File

@ -945,6 +945,16 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
SeekDir(dirptr, current_pos);
dname = ReadDirName(dirptr);
/*
* Remember, name_map_mangle is called by
* get_lanman2_dir_entry(), so the resume name
* could be mangled. Ensure we do the same
* here.
*/
name_map_mangle( dname, False, SNUM(cnum));
if(dname && strcsequal( resume_name, dname))
{
SeekDir(dirptr, current_pos+1);
@ -963,6 +973,15 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
SeekDir(dirptr, start_pos);
for(current_pos = start_pos; (dname = ReadDirName(dirptr)) != NULL; SeekDir(dirptr,++current_pos))
{
/*
* Remember, name_map_mangle is called by
* get_lanman2_dir_entry(), so the resume name
* could be mangled. Ensure we do the same
* here.
*/
name_map_mangle( dname, False, SNUM(cnum));
if(strcsequal( resume_name, dname))
{
SeekDir(dirptr, current_pos+1);