]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
bus-polkit: decrease indentation
authorDavid Tardon <dtardon@redhat.com>
Fri, 26 May 2023 13:15:34 +0000 (15:15 +0200)
committerDavid Tardon <dtardon@redhat.com>
Mon, 19 Jun 2023 10:33:24 +0000 (12:33 +0200)
src/shared/bus-polkit.c

index 45092f4daa80da8d448978cbd069518f8375c6e9..03abe6e26786da8aff53c901fa0b13011ba7c87f 100644 (file)
@@ -128,42 +128,41 @@ int bus_test_polkit(
                 return r;
         else if (r > 0)
                 return 1;
-#if ENABLE_POLKIT
-        else {
-                _cleanup_(sd_bus_message_unrefp) sd_bus_message *request = NULL;
-                _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
-                int authorized = false, challenge = false;
 
-                r = bus_message_new_polkit_auth_call(call, action, details, /* interactive = */ false, &request);
-                if (r < 0)
-                        return r;
+#if ENABLE_POLKIT
+        _cleanup_(sd_bus_message_unrefp) sd_bus_message *request = NULL;
+        _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
+        int authorized = false, challenge = false;
 
-                r = sd_bus_call(call->bus, request, 0, ret_error, &reply);
-                if (r < 0) {
-                        /* Treat no PK available as access denied */
-                        if (bus_error_is_unknown_service(ret_error)) {
-                                sd_bus_error_free(ret_error);
-                                return -EACCES;
-                        }
+        r = bus_message_new_polkit_auth_call(call, action, details, /* interactive = */ false, &request);
+        if (r < 0)
+                return r;
 
-                        return r;
+        r = sd_bus_call(call->bus, request, 0, ret_error, &reply);
+        if (r < 0) {
+                /* Treat no PK available as access denied */
+                if (bus_error_is_unknown_service(ret_error)) {
+                        sd_bus_error_free(ret_error);
+                        return -EACCES;
                 }
 
-                r = sd_bus_message_enter_container(reply, 'r', "bba{ss}");
-                if (r < 0)
-                        return r;
+                return r;
+        }
 
-                r = sd_bus_message_read(reply, "bb", &authorized, &challenge);
-                if (r < 0)
-                        return r;
+        r = sd_bus_message_enter_container(reply, 'r', "bba{ss}");
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_read(reply, "bb", &authorized, &challenge);
+        if (r < 0)
+                return r;
 
-                if (authorized)
-                        return 1;
+        if (authorized)
+                return 1;
 
-                if (_challenge) {
-                        *_challenge = challenge;
-                        return 0;
-                }
+        if (_challenge) {
+                *_challenge = challenge;
+                return 0;
         }
 #endif