* fhandler.cc (fhandler_base::open): Handle query_write_dac flag.

	* fhandler.h (enum query_state): Add query_write_dac flag.
	* fhandler_disk_file.cc (fhandler_disk_file::fchmod): Open file
	with query_write_dac instead of query_write_control.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 1d3797abcaa37a19ba6abed5cfed4b08cd47b3a4..ee1fc5ac356c0a83b7d43c95f9c03ac37200918b 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-24  Corinna Vinschen  <corinna@vinschen.de>
+
+       * fhandler.cc (fhandler_base::open): Handle query_write_dac flag.
+       * fhandler.h (enum query_state): Add query_write_dac flag.
+       * fhandler_disk_file.cc (fhandler_disk_file::fchmod): Open file
+       with query_write_dac instead of query_write_control.
+
 2010-09-24  Corinna Vinschen  <corinna@vinschen.de>
 
        * errno.cc (errmap): Map ERROR_BAD_NET_RESP to ENOSYS.

diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index 64451f6727c6717cbcf24915db174a51cc4472ba..ce5f79b2eb0b971b03d9522a78deb386b048fc67 100644 (file)
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -479,6 +479,9 @@ fhandler_base::open (int flags, mode_t mode)
       case query_write_control:
        access = READ_CONTROL | WRITE_OWNER | WRITE_DAC | FILE_WRITE_ATTRIBUTES;
        break;
+      case query_write_dac:
+       access = READ_CONTROL | WRITE_DAC | FILE_WRITE_ATTRIBUTES;
+       break;
       case query_write_attributes:
        access = READ_CONTROL | FILE_WRITE_ATTRIBUTES;
        break;

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 8e232f0c4458a5504c797ded13d74ddd11c5eb5a..5110d6d8c2ff9da6a01194efcfce04c8eac4bb6a 100644 (file)
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -92,7 +92,8 @@ enum query_state {
   query_read_control = 1,
   query_read_attributes = 2,
   query_write_control = 3,
-  query_write_attributes = 4
+  query_write_dac = 4,
+  query_write_attributes = 5
 };
 
 enum del_lock_called_from {

diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 3cb831168f119c51d223bd1d29de3efea035782e..85be07c3d63cb16fe826a084b1a8c6a79679c519 100644 (file)
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -799,7 +799,7 @@ fhandler_disk_file::fchmod (mode_t mode)
 
   if (!get_handle ())
     {
-      query_open (query_write_control);
+      query_open (query_write_dac);
       if (!(oret = open (O_BINARY, 0)))
        {
          /* Need WRITE_DAC|WRITE_OWNER to write ACLs. */