diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index 7d427135e..98d7a3b2d 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -561,12 +561,10 @@ fhandler_base::open (int flags, mode_t mode)
       access = READ_CONTROL | FILE_READ_ATTRIBUTES;
       break;
     case query_write_control:
-      access = READ_CONTROL | WRITE_OWNER | WRITE_DAC
-	       | (pc.fs_is_samba () ? 0 : FILE_WRITE_ATTRIBUTES);
+      access = READ_CONTROL | WRITE_OWNER | WRITE_DAC | FILE_WRITE_ATTRIBUTES;
       break;
     case query_write_dac:
-      access = READ_CONTROL | WRITE_DAC
-	       | (pc.fs_is_samba () ? 0 : FILE_WRITE_ATTRIBUTES);
+      access = READ_CONTROL | WRITE_DAC | FILE_WRITE_ATTRIBUTES;
       break;
     case query_write_attributes:
       access = READ_CONTROL | FILE_WRITE_ATTRIBUTES;
diff --git a/winsup/cygwin/release/3.3.4 b/winsup/cygwin/release/3.3.4
index d45722ac5..bc74e6914 100644
--- a/winsup/cygwin/release/3.3.4
+++ b/winsup/cygwin/release/3.3.4
@@ -33,3 +33,7 @@ Bug Fixes
 
 - Fix double free for archetype, which is caused when open() fails.
   Addresses: https://cygwin.com/pipermail/cygwin/2022-January/250518.html
+
+- Fix a permission problem when writing DOS attributes on Samba.
+  Addresses: https://cygwin.com/pipermail/cygwin/2022-January/250629.html
+