summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2006-02-10 21:52:43 +0000
committerTom Lane2006-02-10 21:52:43 +0000
commit9878d9a1f1fb64dea76531955ec5c5c69d97aded (patch)
treedf4157c74223d147d11797b946566749dc9340d2
parentbce1d83ee55d0f217c4254216a5c7ccec46f87ad (diff)
Check that SID is enabled while checking for Windows admin privileges.
Magnus
-rw-r--r--src/backend/port/win32/security.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/port/win32/security.c b/src/backend/port/win32/security.c
index 9283f3f6942..7a68a33a7f2 100644
--- a/src/backend/port/win32/security.c
+++ b/src/backend/port/win32/security.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/port/win32/security.c,v 1.8 2004/12/31 22:00:37 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/port/win32/security.c,v 1.8.4.1 2006/02/10 21:52:43 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -78,8 +78,8 @@ pgwin32_is_admin(void)
for (x = 0; x < Groups->GroupCount; x++)
{
- if (EqualSid(AdministratorsSid, Groups->Groups[x].Sid) ||
- EqualSid(PowerUsersSid, Groups->Groups[x].Sid))
+ if ((EqualSid(AdministratorsSid, Groups->Groups[x].Sid) && (Groups->Groups[x].Attributes & SE_GROUP_ENABLED)) ||
+ (EqualSid(PowerUsersSid, Groups->Groups[x].Sid) && (Groups->Groups[x].Attributes & SE_GROUP_ENABLED)))
{
success = TRUE;
break;