summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsource3/script/tests/selftest.sh3
-rwxr-xr-xsource3/script/tests/test_posix_s3.sh2
-rw-r--r--source3/smbd/reply.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 5ec96f63e2..f613f2126f 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -142,6 +142,9 @@ cat >$SERVERCONFFILE<<EOF
path = $PREFIX_ABS/tmp
read only = no
smbd:sharedelay = 100000
+ map hidden = yes
+ map system = yes
+ create mask = 755
[hideunread]
copy = tmp
hide unreadable = yes
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index b9edbb797b..c442684732 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -46,7 +46,7 @@ skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV
skipped="$skipped RAW-ACLS RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
skipped="$skipped RAW-IOCTL RAW-MUX RAW-NOTIFY RAW-OPEN"
skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-RENAME RAW-SEARCH"
-skipped="$skipped RAW-SFILEINFO RAW-STREAMS RAW-UNLINK RAW-WRITE"
+skipped="$skipped RAW-SFILEINFO RAW-STREAMS RAW-WRITE"
echo "WARNING: Skipping tests $skipped"
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 607c12f8b1..cb25b69a31 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2074,7 +2074,7 @@ NTSTATUS unlink_internals(connection_struct *conn, uint32 dirtype,
/* Quick check for "." and ".." */
if (fname[0] == '.') {
if (!fname[1] || (fname[1] == '.' && !fname[2])) {
- if ((dirtype & FILE_ATTRIBUTE_DIRECTORY) && (dirtype & FILE_ATTRIBUTE_SYSTEM)) {
+ if (dirtype & FILE_ATTRIBUTE_DIRECTORY) {
sys_direntry = True;
} else {
continue;