diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-11-13 20:07:31 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-11-19 11:07:31 +0100 |
| commit | 99b72a66ca555422454c4a63d7c9841e15cd14c6 (patch) | |
| tree | 9d1765399c0a447a39fefe352b2180539fe47951 | |
| parent | 288edd686911b5a88977f47d8d83a6e5e7f5e4ed (diff) | |
| download | systemd-99b72a66ca555422454c4a63d7c9841e15cd14c6.tar.gz | |
ask-password: don't hit assert() when we query pw which the user C-d and caching is enabled
(cherry picked from commit e013e10d0e96917b627d54f20e3dba80a17df0d5)
| -rw-r--r-- | src/shared/ask-password-api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c index c41fa2dea6..60f6f60d81 100644 --- a/src/shared/ask-password-api.c +++ b/src/shared/ask-password-api.c @@ -107,10 +107,11 @@ static int add_to_keyring(const char *keyname, AskPasswordFlags flags, char **pa int r; assert(keyname); - assert(passwords); if (!(flags & ASK_PASSWORD_PUSH_CACHE)) return 0; + if (strv_isempty(passwords)) + return 0; r = lookup_key(keyname, &serial); if (r >= 0) { @@ -149,7 +150,6 @@ static int add_to_keyring_and_log(const char *keyname, AskPasswordFlags flags, c int r; assert(keyname); - assert(passwords); r = add_to_keyring(keyname, flags, passwords); if (r < 0) |