From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 11 Jul 2024 12:32:09 +0000 (+0200)
Subject: import-creds: when we hit ENOENT on SMBIOS 11 do not even debug log
X-Git-Tag: v256.3^2~5
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=995c702a347d16cfad4605f3982d5278616ea1f8;p=systemd%2F.git

import-creds: when we hit ENOENT on SMBIOS 11 do not even debug log

We'll *always* hit ENEOENT when iterating through SMBIOS type #11
fields, on the last one. it's very confusing to debug log about that,
let's just not do it.

(cherry picked from commit 5202ee42d5da0ae3a6655d2bc959a19d8c347e9d)
---

diff --git a/src/core/import-creds.c b/src/core/import-creds.c
index f27ffed4a0..e6cf40d5ec 100644
--- a/src/core/import-creds.c
+++ b/src/core/import-creds.c
@@ -595,9 +595,11 @@ static int import_credentials_smbios(ImportCredentialContext *c) {
                         return log_oom();
 
                 r = read_virtual_file(p, sizeof(dmi_field_header) + CREDENTIALS_TOTAL_SIZE_MAX, (char**) &data, &size);
+                if (r == -ENOENT) /* Once we reach ENOENT there are no more DMI Type 11 fields around. */
+                        break;
                 if (r < 0) {
                         /* Once we reach ENOENT there are no more DMI Type 11 fields around. */
-                        log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_WARNING, r, "Failed to open '%s', ignoring: %m", p);
+                        log_warning_errno(r, "Failed to open '%s', ignoring: %m", p);
                         break;
                 }