PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

* fhandler_socket.cc (fhandler_socket::dup): Rearrange. Fix 

conditional.
This commit is contained in:
Corinna Vinschen 2003-05-29 16:16:59 +00:00
parent 14afd35266
commit 4e2db52c1c
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2003-05-29 Pierre Humblet <pierre.humblet@ieee.org>
Corinna Vinschen <corinna@vinschen.de>
* fhandler_socket.cc (fhandler_socket::dup): Rearrange. Fix
conditional.
2003-05-28 Christopher Faylor <cgf@redhat.com>
* mkvers.sh: Avoid "-dontuse" tags.
@ -9,7 +15,7 @@
(mount_info::conv_to_win32_path): Use build_win32 to build windows
path.
* path.h (mount_item::fnmunge): Declare new function.
(mount_item::build_win32): Ditto.
(mount_item::build_win32): Ditto.
* sys/mount.h (MOUNT_ENC): Define.
2003-05-28 Corinna Vinschen <corinna@vinschen.de>

43
winsup/cygwin/fhandler_socket.cc
View File

@ -396,33 +396,34 @@ fhandler_socket::dup (fhandler_base *child)
debug_printf ("here");
fhandler_socket *fhs = (fhandler_socket *) child;
fhs->addr_family = addr_family;
fhs->set_io_handle (get_io_handle ());
if (get_addr_family () == AF_LOCAL)
fhs->set_sun_path (get_sun_path ());
fhs->set_socket_type (get_socket_type ());
/* Since WSADuplicateSocket() fails on NT systems when the process
is currently impersonating a non-privileged account, we revert
to the original account before calling WSADuplicateSocket() and
switch back afterwards as it's also in fork().
If WSADuplicateSocket() still fails for some reason, we fall back
to DuplicateHandle(). */
WSASetLastError (0);
if (cygheap->user.issetuid ())
RevertToSelf ();
fhs->fixup_before_fork_exec (GetCurrentProcessId ());
if (cygheap->user.issetuid ())
ImpersonateLoggedOnUser (cygheap->user.token);
if (winsock2_active && !WSAGetLastError ())
if (winsock2_active)
{
fhs->fixup_after_fork (hMainProc);
if (get_io_handle() != (HANDLE) INVALID_SOCKET)
return 0;
/* Since WSADuplicateSocket() fails on NT systems when the process
is currently impersonating a non-privileged account, we revert
to the original account before calling WSADuplicateSocket() and
switch back afterwards as it's also in fork().
If WSADuplicateSocket() still fails for some reason, we fall back
to DuplicateHandle(). */
WSASetLastError (0);
if (cygheap->user.issetuid ())
RevertToSelf ();
fhs->set_io_handle (get_io_handle ());
fhs->fixup_before_fork_exec (GetCurrentProcessId ());
if (cygheap->user.issetuid ())
ImpersonateLoggedOnUser (cygheap->user.token);
if (!WSAGetLastError ())
{
fhs->fixup_after_fork (hMainProc);
if (fhs->get_io_handle() != (HANDLE) INVALID_SOCKET)
return 0;
}
debug_printf ("WSADuplicateSocket failed, trying DuplicateHandle");
}
debug_printf ("WSADuplicateSocket failed, trying DuplicateHandle");
/* We don't call fhandler_base::dup here since that requires to
have winsock called from fhandler_base and it creates only
inheritable sockets which is wrong for winsock2. */
@ -435,7 +436,7 @@ fhandler_socket::dup (fhandler_base *child)
__seterrno ();
return -1;
}
child->set_io_handle (nh);
fhs->set_io_handle (nh);
return 0;
}