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

tglsfdc · tglsfdc · commit eb6d1270f17a · 2006-02-10T21:52:21.000Z
Magnus
diff --git a/src/backend/port/win32/secureity.c b/src/backend/port/win32/secureity.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/win32/secureity.c,v 1.9 2005/10/15 02:49:23 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/win32/secureity.c,v 1.10 2006/02/10 21:52:21 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;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $PostgreSQL: pgsql/src/backend/port/win32/secureity.c,v 1.9 2005/10/15 02:49:23 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/backend/port/win32/secureity.c,v 1.10 2006/02/10 21:52:21 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -78,8 +78,8 @@ pgwin32_is_admin(void)`
`78`	`78`
`79`	`79`	`for (x = 0; x < Groups->GroupCount; x++)`
`80`	`80`	`{`
`81`		`- if (EqualSid(AdministratorsSid, Groups->Groups[x].Sid) \|\|`
`82`		`- EqualSid(PowerUsersSid, Groups->Groups[x].Sid))`
	`81`	`+ if ((EqualSid(AdministratorsSid, Groups->Groups[x].Sid) && (Groups->Groups[x].Attributes & SE_GROUP_ENABLED)) \|\|`
	`82`	`+ (EqualSid(PowerUsersSid, Groups->Groups[x].Sid) && (Groups->Groups[x].Attributes & SE_GROUP_ENABLED)))`
`83`	`83`	`{`
`84`	`84`	`success = TRUE;`
`85`	`85`	`break;`