Commit eb6d1270 authored by Tom Lane's avatar Tom Lane

Check that SID is enabled while checking for Windows admin privileges.

Magnus
parent 3ac1ac58
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/port/win32/security.c,v 1.9 2005/10/15 02:49:23 momjian Exp $ * $PostgreSQL: pgsql/src/backend/port/win32/security.c,v 1.10 2006/02/10 21:52:21 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -78,8 +78,8 @@ pgwin32_is_admin(void) ...@@ -78,8 +78,8 @@ pgwin32_is_admin(void)
for (x = 0; x < Groups->GroupCount; x++) for (x = 0; x < Groups->GroupCount; x++)
{ {
if (EqualSid(AdministratorsSid, Groups->Groups[x].Sid) || if ((EqualSid(AdministratorsSid, Groups->Groups[x].Sid) && (Groups->Groups[x].Attributes & SE_GROUP_ENABLED)) ||
EqualSid(PowerUsersSid, Groups->Groups[x].Sid)) (EqualSid(PowerUsersSid, Groups->Groups[x].Sid) && (Groups->Groups[x].Attributes & SE_GROUP_ENABLED)))
{ {
success = TRUE; success = TRUE;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment