r20478: Make us survive & activate RAW-UNLINK

(This used to be commit 4f0f917b344743e16e8bacf4e72529a2890590fe)

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 5ec96f63e284bf9d289504ac2e023d05a34e22e5..f613f2126f3c91ed9aae1aa4601867cb516bdff9 100755 (executable)
--- 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 b9edbb797b8b3764bdb50b8c985cae7c1ee8c100..c44268473214dc6daf8d93275497999572b1066e 100755 (executable)
--- 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 607c12f8b13f61e5a6336666cd04052543d659e6..cb25b69a317f19eae799e0fa8c43838889cab712 100644 (file)
--- 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;