shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-05 13:18:06 +03:00
Code

Merge pull request #11297 from yuwata/fix-11295

Browse Source 
ask-password: fix assertion
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-01-02 08:19:27 +01:00 committed by GitHub
commit 339725910a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,7 +156,7 @@ static int add_to_keyring_and_log(const char *keyname, AskPasswordFlags flags, c
return 0; 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; key_serial_t serial;
int r; int r;
@ -341,7 +341,7 @@ int ask_password_tty(
goto finish; goto finish;
} }
if (notify >= 0 && pollfd[POLL_INOTIFY].revents != 0) { if (notify >= 0 && pollfd[POLL_INOTIFY].revents != 0 && keyname) {
(void) flush_fd(notify); (void) flush_fd(notify);
r = ask_password_keyring(keyname, flags, ret); r = ask_password_keyring(keyname, flags, ret);

1
src/shared/ask-password-api.h
View File

@ -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_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_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); int ask_password_auto(const char *message, const char *icon, const char *id, const char *keyname, usec_t until, AskPasswordFlags flag, char ***ret);