From d501c6adee491009ce6ebde3581b6743937794f1 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Sun, 9 Jul 2000 21:02:44 +0000 Subject: [PATCH] * spawn.cc (spawn_guts): Close handle `hToken' only if it's not copied from myself->token. * syscalls.cc (seteuid): Replace CopySid by memcpy which is foolproof here. --- winsup/cygwin/ChangeLog | 7 +++++++ winsup/cygwin/spawn.cc | 2 +- winsup/cygwin/syscalls.cc | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index b301fc913..04f3ffdb1 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +Sun Jul 9 21:52:00 2000 Corinna Vinschen + + * spawn.cc (spawn_guts): Close handle `hToken' only if it's not + copied from myself->token. + * syscalls.cc (seteuid): Replace CopySid by memcpy which is foolproof + here. + Sun Jul 9 01:19:06 2000 Christopher Faylor * cygwin.din: Export _getmode and getmode to allow querying of binary diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index 734d2d2bf..f6da86385 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -640,7 +640,7 @@ skip_arg_parsing: ResumeThread (pi.hThread); ForceCloseHandle (pi.hThread); - if (hToken) + if (hToken && hToken != myself->token) CloseHandle (hToken); DWORD res; diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 9594a4931..61479aa29 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1882,9 +1882,9 @@ seteuid (uid_t uid) } myself->uid = uid; strcpy (myself->username, pi.username); - CopySid (MAX_SID_LEN, myself->psid, pi.psid); strcpy (myself->logsrv, pi.logsrv); strcpy (myself->domain, pi.domain); + memcpy (myself->sidbuf, pi.sidbuf, MAX_SID_LEN); } } else