From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 30 Dec 2018 12:13:43 +0000 (+0900)
Subject: ask-password-api: do not call ask_password_keyring() if keyname == NULL
X-Git-Tag: v241-rc1~138^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f00998c8739ac6adc2b7623cc1e5a8f67d95d7d;p=thirdparty%2Fsystemd.git

ask-password-api: do not call ask_password_keyring() if keyname == NULL

Fixes #11295.
---

diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index 017d5026def..072bf72c569 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);