ask-password: Use default timeout if SYSTEMD_ASK_PASSWORD_KEYRING_TIMEOUT_SEC is unset

Follow-up for d9f4dad986
2024-11-02 23:20:57 +01:00
parent d980aee1e8
commit b3bca11c18
1 changed files with 2 additions and 4 deletions
@@ -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);