sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-24 21:49:29 +03:00
Code Activity

Fix for #1064 - ensure truncate attribute checking is done correctly on "hidden" dot files.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison
-
parent f3556724ab
commit a6045c904f
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/smbd/dosmode.c
View File

@ -111,16 +111,14 @@ mode_t unix_mode(connection_struct *conn,int dosmode,const char *fname)
return(result);
}
/****************************************************************************
change a unix mode to a dos mode
****************************************************************************/
uint32 dos_mode(connection_struct *conn,char *path,SMB_STRUCT_STAT *sbuf)
uint32 dos_mode_from_sbuf(connection_struct *conn, SMB_STRUCT_STAT *sbuf)
{
int result = 0;
DEBUG(8,("dos_mode: %s\n", path));
if ((sbuf->st_mode & S_IWUSR) == 0)
result |= aRONLY;
@ -149,6 +147,30 @@ uint32 dos_mode(connection_struct *conn,char *path,SMB_STRUCT_STAT *sbuf)
#endif
#endif
DEBUG(8,("dos_mode_from_sbuf returning "));
if (result & aHIDDEN) DEBUG(8, ("h"));
if (result & aRONLY ) DEBUG(8, ("r"));
if (result & aSYSTEM) DEBUG(8, ("s"));
if (result & aDIR ) DEBUG(8, ("d"));
if (result & aARCH ) DEBUG(8, ("a"));
DEBUG(8,("\n"));
return result;
}
/****************************************************************************
change a unix mode to a dos mode
****************************************************************************/
uint32 dos_mode(connection_struct *conn,char *path,SMB_STRUCT_STAT *sbuf)
{
int result = 0;
DEBUG(8,("dos_mode: %s\n", path));
result = dos_mode_from_sbuf(conn, sbuf);
/* Now do any modifications that depend on the path name. */
/* hide files with a name starting with a . */
if (lp_hide_dot_files(SNUM(conn))) {
char *p = strrchr_m(path,'/');

3
source/smbd/open.c
View File

@ -754,7 +754,8 @@ static BOOL open_match_attributes(connection_struct *conn, char *path, mode_t ex
old_dos_mode = dos_mode(conn, path, &sbuf);
sbuf.st_mode = new_mode;
new_dos_mode = dos_mode(conn, path, &sbuf);
/* The new mode conversion shouldn't look at pathname. */
new_dos_mode = dos_mode_from_sbuf(conn, &sbuf);
noarch_old_dos_mode = (old_dos_mode & ~FILE_ATTRIBUTE_ARCHIVE);
noarch_new_dos_mode = (new_dos_mode & ~FILE_ATTRIBUTE_ARCHIVE);