summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2013-05-29 16:53:57 +0200
committerTim Jenssen <tim.jenssen@digia.com>2013-05-29 16:58:27 +0200
commit5c68077d847c59393f49d19cffbe31e0a7f31a8a (patch)
treec7fc36ad995a8e49796d51f0e54210596ac88fd9 /src
parentd1f768846d484ef1a1787e56c563985973ec4bdb (diff)
revert any changes at hasAdminRights()
Task-number: QTIFW-266 Change-Id: Ie8d7cae686cbe6e00ddfbd715c72f937a7f1929d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/libs/installer/adminauthorization_win.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/installer/adminauthorization_win.cpp b/src/libs/installer/adminauthorization_win.cpp
index a985616c9..20420cef0 100644
--- a/src/libs/installer/adminauthorization_win.cpp
+++ b/src/libs/installer/adminauthorization_win.cpp
@@ -81,7 +81,7 @@ bool AdminAuthorization::authorize()
bool AdminAuthorization::hasAdminRights()
{
SID_IDENTIFIER_AUTHORITY authority = { SECURITY_NT_AUTHORITY };
- PSID adminGroup = 0;
+ PSID adminGroup;
// Initialize SID.
if (!AllocateAndInitializeSid(&authority,
2,
@@ -92,11 +92,11 @@ bool AdminAuthorization::hasAdminRights()
return false;
BOOL isInAdminGroup = FALSE;
- if (CheckTokenMembership(0, adminGroup, &isInAdminGroup))
- isInAdminGroup = TRUE;
+ if (!CheckTokenMembership(0, adminGroup, &isInAdminGroup))
+ isInAdminGroup = FALSE;
FreeSid(adminGroup);
- return (isInAdminGroup == BOOL(TRUE));
+ return isInAdminGroup;
}
bool AdminAuthorization::execute(QWidget *, const QString &program, const QStringList &arguments)