From 8a111277c4a12c803f5ace26efd008949dd621d4 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 30 Dec 2018 21:09:41 +0900 Subject: [PATCH 1/2] ask-password: make ask_password_keyring() static --- src/shared/ask-password-api.c | 2 +- src/shared/ask-password-api.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c index 246e27a1357..017d5026def 100644 --- a/src/shared/ask-password-api.c +++ b/src/shared/ask-password-api.c @@ -156,7 +156,7 @@ static int add_to_keyring_and_log(const char *keyname, AskPasswordFlags flags, c return 0; } -int ask_password_keyring(const char *keyname, AskPasswordFlags flags, char ***ret) { +static int ask_password_keyring(const char *keyname, AskPasswordFlags flags, char ***ret) { key_serial_t serial; int r; diff --git a/src/shared/ask-password-api.h b/src/shared/ask-password-api.h index 2d84ba6b042..15762b9cde3 100644 --- a/src/shared/ask-password-api.h +++ b/src/shared/ask-password-api.h @@ -17,5 +17,4 @@ typedef enum AskPasswordFlags { int ask_password_tty(int tty_fd, const char *message, const char *keyname, usec_t until, AskPasswordFlags flags, const char *flag_file, char ***ret); int ask_password_agent(const char *message, const char *icon, const char *id, const char *keyname, usec_t until, AskPasswordFlags flag, char ***ret); -int ask_password_keyring(const char *keyname, AskPasswordFlags flags, char ***ret); int ask_password_auto(const char *message, const char *icon, const char *id, const char *keyname, usec_t until, AskPasswordFlags flag, char ***ret); From 1f00998c8739ac6adc2b7623cc1e5a8f67d95d7d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 30 Dec 2018 21:13:43 +0900 Subject: [PATCH 2/2] ask-password-api: do not call ask_password_keyring() if keyname == NULL Fixes #11295. --- src/shared/ask-password-api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);