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

More gentest fun :-). NB. I'm not fixing OpenX breakage 'cos if you look

Browse Source 
at what W2K3 accepts here it's COMPLETELY BROKEN ! :-).
Jeremy.
This commit is contained in:
Jeremy Allison -
parent d34785194c
commit 5107f6ee70
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/smbd/reply.c
View File

@ -1457,8 +1457,12 @@ NTSTATUS unlink_internals(connection_struct *conn, int dirtype, char *name)
pstring fname; pstring fname;
pstrcpy(fname,dname); pstrcpy(fname,dname);
if((strcmp(fname, ".") == 0) || (strcmp(fname, "..")==0)) /* Quick check for "." and ".." */
continue; if (fname[0] == '.') {
if (!fname[1] || (fname[1] == '.' && !fname[2])) {
continue;
}
}
if(!mask_match(fname, mask, case_sensitive)) if(!mask_match(fname, mask, case_sensitive))
continue; continue;
@ -3357,6 +3361,13 @@ NTSTATUS rename_internals_fsp(connection_struct *conn, files_struct *fsp, char *
ZERO_STRUCT(sbuf); ZERO_STRUCT(sbuf);
unix_convert(newname,conn,newname_last_component,&bad_path,&sbuf); unix_convert(newname,conn,newname_last_component,&bad_path,&sbuf);
/* Quick check for "." and ".." */
if (newname_last_component[0] == '.') {
if (!newname_last_component[1] || (newname_last_component[1] == '.' && !newname_last_component[2])) {
return NT_STATUS_ACCESS_DENIED;
}
}
/* Ensure newname contains a '/' */ /* Ensure newname contains a '/' */
if(strrchr_m(newname,'/') == 0) { if(strrchr_m(newname,'/') == 0) {
pstring tmpstr; pstring tmpstr;
@ -3470,6 +3481,13 @@ NTSTATUS rename_internals(connection_struct *conn, char *name, char *newname, BO
rc = unix_convert(name,conn,0,&bad_path1,&sbuf1); rc = unix_convert(name,conn,0,&bad_path1,&sbuf1);
unix_convert(newname,conn,newname_last_component,&bad_path2,&sbuf2); unix_convert(newname,conn,newname_last_component,&bad_path2,&sbuf2);
/* Quick check for "." and ".." */
if (newname_last_component[0] == '.') {
if (!newname_last_component[1] || (newname_last_component[1] == '.' && !newname_last_component[2])) {
return NT_STATUS_ACCESS_DENIED;
}
}
/* /*
* Split the old name into directory and last component * Split the old name into directory and last component
* strings. Note that unix_convert may have stripped off a * strings. Note that unix_convert may have stripped off a
@ -3478,7 +3496,7 @@ NTSTATUS rename_internals(connection_struct *conn, char *name, char *newname, BO
* name and newname contain a / character or neither of them do * name and newname contain a / character or neither of them do
* as this is checked in resolve_wildcards(). * as this is checked in resolve_wildcards().
*/ */
p = strrchr_m(name,'/'); p = strrchr_m(name,'/');
if (!p) { if (!p) {
pstrcpy(directory,"."); pstrcpy(directory,".");
@ -3657,8 +3675,12 @@ directory = %s, newname = %s, newname_last_component = %s, is_8_3 = %d\n",
pstrcpy(fname,dname); pstrcpy(fname,dname);
if((strcmp(fname, ".") == 0) || (strcmp(fname, "..")==0)) /* Quick check for "." and ".." */
continue; if (fname[0] == '.') {
if (!fname[1] || (fname[1] == '.' && !fname[2])) {
continue;
}
}
if(!mask_match(fname, mask, case_sensitive)) if(!mask_match(fname, mask, case_sensitive))
continue; continue;