From: corinna <corinna>
Date: Wed, 26 Nov 2003 14:29:22 +0000 (+0000)
Subject: 	* sec_helper.cc (set_process_privilege): Rename restore_priv to
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1b601d1407c152664b30f1fbba551525f1435240;p=pf3gnuchains%2Fsourceware.git

	* sec_helper.cc (set_process_privilege): Rename restore_priv to
	priv_luid.

	* sec_helper.cc (set_process_privilege): Call LookupPrivilegeValue
	before opening the token.
---

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a19126aa15..ad11c505a2 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,15 @@
 2003-11-26  Corinna Vinschen  <corinna@vinschen.de>
 
+	* sec_helper.cc (set_process_privilege): Rename restore_priv to
+	priv_luid.
+
+2003-11-26  Pierre Humblet <pierre.humblet@ieee.org>
+
+	* sec_helper.cc (set_process_privilege): Call LookupPrivilegeValue
+	before opening the token.
+
+2003-11-26  Corinna Vinschen  <corinna@vinschen.de>
+
 	* dir.cc (mkdir): Use local security_descriptor. Call
 	set_security_attribute appropriately.
 	* external.cc (cygwin_internal): Ditto.
diff --git a/winsup/cygwin/sec_helper.cc b/winsup/cygwin/sec_helper.cc
index f0b851be87..9d81004313 100644
--- a/winsup/cygwin/sec_helper.cc
+++ b/winsup/cygwin/sec_helper.cc
@@ -329,11 +329,17 @@ int
 set_process_privilege (const char *privilege, bool enable, bool use_thread)
 {
   HANDLE hToken = NULL;
-  LUID restore_priv;
+  LUID priv_luid;
   TOKEN_PRIVILEGES new_priv, orig_priv;
   int ret = -1;
   DWORD size;
 
+  if (!LookupPrivilegeValue (NULL, privilege, &priv_luid))
+    {
+      __seterrno ();
+      goto out;
+    }
+
   if ((use_thread
        && !OpenThreadToken (GetCurrentThread (), TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES,
 			    0, &hToken))
@@ -345,14 +351,8 @@ set_process_privilege (const char *privilege, bool enable, bool use_thread)
       goto out;
     }
 
-  if (!LookupPrivilegeValue (NULL, privilege, &restore_priv))
-    {
-      __seterrno ();
-      goto out;
-    }
-
   new_priv.PrivilegeCount = 1;
-  new_priv.Privileges[0].Luid = restore_priv;
+  new_priv.Privileges[0].Luid = priv_luid;
   new_priv.Privileges[0].Attributes = enable ? SE_PRIVILEGE_ENABLED : 0;
 
   if (!AdjustTokenPrivileges (hToken, FALSE, &new_priv,