summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/dtable.cc5
2 files changed, 8 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 47fefc0a2..c9f1a7ca2 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-04 Corinna Vinschen <corinna@vinschen.de>
+
+ * dtable.cc (dtable::init_std_file_from_handle): Fix a comment to
+ reflect the current state.
+
2011-04-04 Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
* Makefile.in (fhandler_proc_CFLAGS): Define USERNAME, HOSTNAME,
diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
index 4529aa906..b3e45483d 100644
--- a/winsup/cygwin/dtable.cc
+++ b/winsup/cygwin/dtable.cc
@@ -299,8 +299,9 @@ dtable::init_std_file_from_handle (int fd, HANDLE handle)
if (handle_to_fn (handle, name))
dev.parse (name);
else if (strcmp (name, ":sock:") == 0
- /* On NT4, NtQueryObject returns STATUS_NOT_IMPLEMENTED when
- called for a socket handle. */
+ /* NtQueryObject returns an error when called on an LSP socket
+ handle. While fdsock now tries to fetch the underlying
+ base socket, this only works on Vista and later. */
|| (strcmp (name, unknown_file) == 0
&& !::getsockopt ((SOCKET) handle, SOL_SOCKET, SO_RCVBUF,
(char *) &rcv, &len)))