aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-12-30 21:13:43 +0900
committerMike Gilbert <floppym@gentoo.org>2019-01-03 11:53:05 -0500
commitd175cc8b97b24bf342dc1dc841f4dda2f72ea804 (patch)
tree4f4ce8a8fdb3a9296ece2e3a9b37ca997b1b40c5
parentask-password: make ask_password_keyring() static (diff)
downloadsystemd-d175cc8b97b24bf342dc1dc841f4dda2f72ea804.tar.gz
systemd-d175cc8b97b24bf342dc1dc841f4dda2f72ea804.tar.bz2
systemd-d175cc8b97b24bf342dc1dc841f4dda2f72ea804.zip
ask-password-api: do not call ask_password_keyring() if keyname == NULL
Fixes #11295. (cherry picked from commit 1f00998c8739ac6adc2b7623cc1e5a8f67d95d7d)
-rw-r--r--src/shared/ask-password-api.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index 017d5026d..072bf72c5 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -341,7 +341,7 @@ int ask_password_tty(
goto finish;
}
- if (notify >= 0 && pollfd[POLL_INOTIFY].revents != 0) {
+ if (notify >= 0 && pollfd[POLL_INOTIFY].revents != 0 && keyname) {
(void) flush_fd(notify);
r = ask_password_keyring(keyname, flags, ret);