From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 1 Nov 2024 12:48:58 +0000 (+0100)
Subject: ask-password: Use default timeout if SYSTEMD_ASK_PASSWORD_KEYRING_TIMEOUT_SEC is... 
X-Git-Tag: v257-rc1~44^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3bca11c180ed300e6d3b97d6cb29d1b0b737aac;p=thirdparty%2Fsystemd.git

ask-password: Use default timeout if SYSTEMD_ASK_PASSWORD_KEYRING_TIMEOUT_SEC is unset

Follow-up for d9f4dad986dcebd51bdaeb8ba3d2c00cdc0d701e
---

diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index 0c3156cd276..aa45468402b 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -115,7 +115,7 @@ static int touch_ask_password_directory(AskPasswordFlags flags) {
 }
 
 static usec_t keyring_cache_timeout(void) {
-        static usec_t saved_timeout = USEC_INFINITY;
+        static usec_t saved_timeout = KEYRING_TIMEOUT_USEC;
         static bool saved_timeout_set = false;
         int r;
 
@@ -123,9 +123,7 @@ static usec_t keyring_cache_timeout(void) {
                 return saved_timeout;
 
         const char *e = secure_getenv("SYSTEMD_ASK_PASSWORD_KEYRING_TIMEOUT_SEC");
-        if (streq_ptr(e, "default"))
-                saved_timeout = KEYRING_TIMEOUT_USEC;
-        else if (e) {
+        if (e && !streq(e, "default")) {
                 r = parse_sec(e, &saved_timeout);
                 if (r < 0)
                         log_debug_errno(r, "Invalid value in $SYSTEMD_ASK_PASSWORD_KEYRING_TIMEOUT_SEC, ignoring: %s", e);