From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 28 Apr 2021 12:32:49 +0000 (+0200)
Subject: hostnamed: retrieve product UUID after authentication, not before
X-Git-Tag: v249-rc1~325^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66ee229879f998d6d1d02a1db23b906237d5258e;p=thirdparty%2Fsystemd.git

hostnamed: retrieve product UUID after authentication, not before
---

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 92af4d19137..27d9fecbc1b 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -938,18 +938,6 @@ static int method_get_product_uuid(sd_bus_message *m, void *userdata, sd_bus_err
         assert(m);
         assert(c);
 
-        r = id128_get_product(&uuid);
-        if (r < 0) {
-                if (r == -EADDRNOTAVAIL)
-                        log_debug_errno(r, "DMI product UUID is all 0x00 or all 0xFF, ignoring.");
-                else
-                        log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_WARNING, r,
-                                       "Failed to read product UUID, ignoring: %m");
-
-                return sd_bus_error_set(error, BUS_ERROR_NO_PRODUCT_UUID,
-                                        "Failed to read product UUID from firmware.");
-        }
-
         r = sd_bus_message_read(m, "b", &interactive);
         if (r < 0)
                 return r;
@@ -968,6 +956,18 @@ static int method_get_product_uuid(sd_bus_message *m, void *userdata, sd_bus_err
         if (r == 0)
                 return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
 
+        r = id128_get_product(&uuid);
+        if (r < 0) {
+                if (r == -EADDRNOTAVAIL)
+                        log_debug_errno(r, "DMI product UUID is all 0x00 or all 0xFF, ignoring.");
+                else
+                        log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_WARNING, r,
+                                       "Failed to read product UUID, ignoring: %m");
+
+                return sd_bus_error_set(error, BUS_ERROR_NO_PRODUCT_UUID,
+                                        "Failed to read product UUID from firmware.");
+        }
+
         r = sd_bus_message_new_method_return(m, &reply);
         if (r < 0)
                 return r;