picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tty-ask-pw-agent: the message string might not be set

Browse source
This commit is contained in:
Lennart Poettering 2020-08-26 23:05:46 +02:00
parent 4c4a018cab
commit 66bff73b4f
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/shared/ask-password-api.c
View file

@ -237,6 +237,9 @@ int ask_password_plymouth(
assert(ret);
if (!message)
message = "Password:";
if (flag_file) {
notify = inotify_init1(IN_CLOEXEC|IN_NONBLOCK);
if (notify < 0)

10
src/tty-ask-password-agent/tty-ask-password-agent.c
View file

@ -210,7 +210,7 @@ static int process_one_password_file(const char *filename) {
switch (arg_action) {
case ACTION_LIST:
printf("'%s' (PID %u)\n", message, pid);
printf("'%s' (PID %u)\n", strna(message), pid);
return 0;
case ACTION_WALL: {
@ -219,7 +219,7 @@ static int process_one_password_file(const char *filename) {
if (asprintf(&wall,
"Password entry required for \'%s\' (PID %u).\r\n"
"Please enter password with the systemd-tty-ask-password-agent tool.",
message,
strna(message),
pid) < 0)
return log_oom();
@ -233,7 +233,7 @@ static int process_one_password_file(const char *filename) {
if (access(socket_name, W_OK) < 0) {
if (arg_action == ACTION_QUERY)
log_info("Not querying '%s' (PID %u), lacking privileges.", message, pid);
log_info("Not querying '%s' (PID %u), lacking privileges.", strna(message), pid);
return 0;
}
@ -246,7 +246,6 @@ static int process_one_password_file(const char *filename) {
r = ask_password_plymouth(message, not_after, flags, filename, &passwords);
else
r = agent_ask_password_tty(message, not_after, flags, filename, &passwords);
if (r < 0) {
/* If the query went away, that's OK */
if (IN_SET(r, -ETIME, -ENOENT))
@ -262,8 +261,7 @@ static int process_one_password_file(const char *filename) {
if (r < 0)
return log_error_errno(r, "Failed to send: %m");
break;
}
}
}}
return 0;
}