From d079ab4d37ca37cef04e43aa333ab2b53c81699d Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 27 Jan 2022 15:22:39 +0100 Subject: Revert "Cygwin: fix permission problem when writing DAC info on Samba shares" This reverts commit 0390cc85727b0165b5cdfcff7578cac94ae3371d. There's no indication what exact situation this patch was supposed to solve, and local testing doesn't show any such problems. However, this patch itself introduced a new problem, as outlined by https://cygwin.com/pipermail/cygwin/2022-January/250629.html Signed-off-by: Corinna Vinschen --- winsup/cygwin/fhandler.cc | 6 ++---- winsup/cygwin/release/3.3.4 | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index 7d42713..98d7a3b 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 d45722a..bc74e69 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 + -- cgit v1.1