summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/security.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 0c158f2c8..fe75a1b81 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
2007-01-24 Corinna Vinschen <corinna@vinschen.de>
+ * security.h (pop_thread_privilege): Revert to previous state, not
+ to token used for impersonation.
+
+2007-01-24 Corinna Vinschen <corinna@vinschen.de>
+
* cygheap.h (cygheap_user::deimpersonate): Always RevertToSelf.
2007-01-23 Corinna Vinschen <corinna@vinschen.de>
diff --git a/winsup/cygwin/security.h b/winsup/cygwin/security.h
index f1d624ff7..6d77716e5 100644
--- a/winsup/cygwin/security.h
+++ b/winsup/cygwin/security.h
@@ -408,10 +408,10 @@ void set_cygwin_privileges (HANDLE token);
#define pop_thread_privilege() \
if (_dup_token) \
{ \
- if (_token == hProcToken) \
+ if (!cygheap->user.issetuid ()) \
RevertToSelf (); \
else \
- ImpersonateLoggedOnUser (_token); \
+ cygheap->user.reimpersonate (); \
CloseHandle (_dup_token); \
} \
}