The branch, v3-2-stable has been updated via cd2f9fe16e8ee8f0bd15ba4dea6c7d043ede5e07 (commit) via e6213fa5e40c0528a6bfdebf333af33ca0a96f51 (commit) via 1f832dcc9c1ef6b89b2580d85f32b7bd53413218 (commit) from aa817cec0648130920daf082626eefb3a14f7440 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log ----------------------------------------------------------------- commit cd2f9fe16e8ee8f0bd15ba4dea6c7d043ede5e07 Author: Karolin Seeger <ksee...@samba.org> Date: Tue Mar 31 10:44:20 2009 +0200 VERSION: Raise version number up to 3.2.9. Karolin (cherry picked from commit d999a7e99804bf71f62c905452a720c20016f8e9) commit e6213fa5e40c0528a6bfdebf333af33ca0a96f51 Author: Karolin Seeger <ksee...@samba.org> Date: Tue Mar 31 10:43:47 2009 +0200 WHATSNEW: Update changes. Karolin (cherry picked from commit bee6e86c71278563d52f9bde19ffb4bda2a35d1b) commit 1f832dcc9c1ef6b89b2580d85f32b7bd53413218 Author: Jeremy Allison <j...@samba.org> Date: Mon Mar 30 15:09:10 2009 -0700 Ensure files starting with multiple dots are hidden if "hide dot files" is set. Thanks to Barry Kelly <bkelly...@gmail.com> for pointing this one out. Jeremy. (cherry picked from commit 5bdc16a867b9c14682b327c79f79834edcd6842d) ----------------------------------------------------------------------- Summary of changes: WHATSNEW.txt | 1 + source/VERSION | 2 +- source/smbd/dosmode.c | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 6044e1f..d2c7893 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -56,6 +56,7 @@ o Jeremy Allison <j...@samba.org> * Allow DFS client paths to work when POSIX pathnames have been selected. * Try and fix the build farm RAW-STREAMS errors. + * Ensure files starting with multiple dots are hidden. o Steven Danneman <steven.danne...@isilon.com> diff --git a/source/VERSION b/source/VERSION index c6094a8..5847926 100644 --- a/source/VERSION +++ b/source/VERSION @@ -25,7 +25,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=2 -SAMBA_VERSION_RELEASE=8 +SAMBA_VERSION_RELEASE=9 ######################################################## # Bug fix releases use a letter for the patch revision # diff --git a/source/smbd/dosmode.c b/source/smbd/dosmode.c index 69100bf..8a5a7b0 100644 --- a/source/smbd/dosmode.c +++ b/source/smbd/dosmode.c @@ -319,8 +319,10 @@ uint32 dos_mode_msdfs(connection_struct *conn, const char *path,SMB_STRUCT_STAT } else { p = path; } - - if (p[0] == '.' && p[1] != '.' && p[1] != 0) { + + /* Only . and .. are not hidden. */ + if (p[0] == '.' && !((p[1] == '\0') || + (p[1] == '.' && p[2] == '\0'))) { result |= aHIDDEN; } } @@ -371,8 +373,10 @@ uint32 dos_mode(connection_struct *conn, const char *path,SMB_STRUCT_STAT *sbuf) } else { p = path; } - - if (p[0] == '.' && p[1] != '.' && p[1] != 0) { + + /* Only . and .. are not hidden. */ + if (p[0] == '.' && !((p[1] == '\0') || + (p[1] == '.' && p[2] == '\0'))) { result |= aHIDDEN; } } -- Samba Shared Repository