shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-28 05:57:33 +03:00
Code

ask-password: Drop "default" for SYSTEMD_ASK_PASSWORD_KEYRING_TIMEOUT_SEC

Browse Source 
Users can simply unset the environment variable to achieve the same effect.
This commit is contained in:
Daan De Meyer 2024-11-01 12:45:29 +01:00
parent b3bca11c18
commit 01d138b990
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/ENVIRONMENT.md
View File

@ -738,9 +738,8 @@ Tools using the Varlink protocol (such as `varlinkctl`) or sd-bus (such as
`systemd-ask-password`:
* `$SYSTEMD_ASK_PASSWORD_KEYRING_TIMEOUT_SEC` - takes a timespan or `default`,
which controls the expiration time of keys stored in the kernel keyring by
`systemd-ask-password`. If unset or set to `default`, the default expiration
of 150 seconds is used. If set to `0`, keys are not cached in the kernel
keyring. If set to `infinity`, keys are cached without an expiration time in
the kernel keyring.
* `$SYSTEMD_ASK_PASSWORD_KEYRING_TIMEOUT_SEC` - takes a timespan, which controls
the expiration time of keys stored in the kernel keyring by `systemd-ask-password`.
If unset, the default expiration of 150 seconds is used. If set to `0`, keys are
not cached in the kernel keyring. If set to `infinity`, keys are cached without an
expiration time in the kernel keyring.

2
src/shared/ask-password-api.c
View File

@ -123,7 +123,7 @@ static usec_t keyring_cache_timeout(void) {
return saved_timeout;
const char *e = secure_getenv("SYSTEMD_ASK_PASSWORD_KEYRING_TIMEOUT_SEC");
if (e && !streq(e, "default")) {
if (e) {
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);