summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/fhandler_tty.cc6
2 files changed, 6 insertions, 5 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f1e3b7bb7..9bbfb3ffb 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
2010-04-19 Corinna Vinschen <corinna@vinschen.de>
+ * fhandler_tty.cc (fhandler_tty_slave::fch_set_sd): Remove commented out
+ code.
+
+2010-04-19 Corinna Vinschen <corinna@vinschen.de>
+
* autoload.cc (GetNamedPipeClientProcessId): Define.
* fhandler.h (fhandler_tty_slave::fch_open_handles): Declare private.
(fhandler_tty_slave::fch_close_handles): Ditto.
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index b95bd5f3e..734fef2a9 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1210,9 +1210,7 @@ fhandler_tty_slave::fch_set_sd (security_descriptor &sd, bool chown)
security_descriptor sd_old;
get_object_sd (input_available_event, sd_old);
- if (/*!set_object_sd (get_io_handle (), sd, chown)
- && !set_object_sd (get_output_handle (), sd, chown)
- && */ !set_object_sd (input_available_event, sd, chown)
+ if (!set_object_sd (input_available_event, sd, chown)
&& !set_object_sd (output_mutex, sd, chown)
&& !set_object_sd (input_mutex, sd, chown)
&& !set_object_sd (inuse, sd, chown)
@@ -1223,8 +1221,6 @@ fhandler_tty_slave::fch_set_sd (security_descriptor &sd, bool chown)
&& (!ioctl_done_event
|| !set_object_sd (ioctl_done_event, sd, chown)))
return 0;
- /*set_object_sd (get_io_handle (), sd_old, chown);
- set_object_sd (get_output_handle (), sd_old, chown);*/
set_object_sd (input_available_event, sd_old, chown);
set_object_sd (output_mutex, sd_old, chown);
set_object_sd (input_mutex, sd_old, chown);