From caaa3dcada6575d00b739b7f0a19fe0f031eea1d Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 18 Aug 2015 18:02:39 -0500 Subject: [PATCH] win32_common.c: don't short-circuit when acquiring privileges --- src/win32_common.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) 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 -- 2.43.0