From: Eric Biggers <ebiggers3@gmail.com>
Date: Tue, 18 Aug 2015 23:02:39 +0000 (-0500)
Subject: win32_common.c: don't short-circuit when acquiring privileges
X-Git-Tag: v1.8.2~6
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=caaa3dcada6575d00b739b7f0a19fe0f031eea1d

win32_common.c: don't short-circuit when acquiring privileges
---

diff --git a/src/win32_common.c b/src/win32_common.c
index 79dac96e..aa5be377 100644
--- a/src/win32_common.c
+++ b/src/win32_common.c
@@ -62,17 +62,21 @@ out:
 static bool
 win32_modify_capture_privileges(bool enable)
 {
-	return win32_modify_privilege(SE_BACKUP_NAME, enable)
-	    && win32_modify_privilege(SE_SECURITY_NAME, enable);
+	bool ok = true;
+	ok &= win32_modify_privilege(SE_BACKUP_NAME, enable);
+	ok &= win32_modify_privilege(SE_SECURITY_NAME, enable);
+	return ok;
 }
 
 static bool
 win32_modify_apply_privileges(bool enable)
 {
-	return win32_modify_privilege(SE_RESTORE_NAME, enable)
-	    && win32_modify_privilege(SE_SECURITY_NAME, enable)
-	    && win32_modify_privilege(SE_TAKE_OWNERSHIP_NAME, enable)
-	    && win32_modify_privilege(SE_MANAGE_VOLUME_NAME, enable);
+	bool ok = true;
+	ok &= win32_modify_privilege(SE_RESTORE_NAME, enable);
+	ok &= win32_modify_privilege(SE_SECURITY_NAME, enable);
+	ok &= win32_modify_privilege(SE_TAKE_OWNERSHIP_NAME, enable);
+	ok &= win32_modify_privilege(SE_MANAGE_VOLUME_NAME, enable);
+	return ok;
 }
 
 static void