ask-password: refer to right binary name in wall message

[elogind.git] / src / tty-ask-password-agent.c

diff --git a/src/tty-ask-password-agent.c b/src/tty-ask-password-agent.c
index d610cbd75ae95cb2c2e2819de33ec4a565c34d42..2e8a92fe53fad1c1f61ab42593b8e153f3f5d97b 100644 (file)
--- a/src/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent.c
@@ -35,6 +35,7 @@
 #include "conf-parser.h"
 #include "utmp-wtmp.h"
 #include "socket-util.h"
+#include "ask-password-api.h"
 
 static enum {
         ACTION_LIST,
@@ -212,6 +213,7 @@ static int parse_password(const char *filename, char **wall) {
                 { "NotAfter", config_parse_uint64,   &not_after,   "Ask" },
                 { "Message",  config_parse_string,   &message,     "Ask" },
                 { "PID",      config_parse_unsigned, &pid,         "Ask" },
+                { NULL, NULL, NULL, NULL }
         };
 
         FILE *f;
@@ -229,7 +231,7 @@ static int parse_password(const char *filename, char **wall) {
                 return -errno;
         }
 
-        if ((r = config_parse(filename, f, NULL, items, false, NULL)) < 0) {
+        if ((r = config_parse(filename, f, NULL, items, true, NULL)) < 0) {
                 log_error("Failed to parse password file %s: %s", filename, strerror(-r));
                 goto finish;
         }
@@ -253,7 +255,7 @@ static int parse_password(const char *filename, char **wall) {
 
                 if (asprintf(&_wall,
                              "%s%sPassword entry required for \'%s\' (PID %u).\r\n"
-                             "Please enter password with the systemd-tty-password-agent tool!",
+                             "Please enter password with the systemd-tty-ask-password-agent tool!",
                              *wall ? *wall : "",
                              *wall ? "\r\n\r\n" : "",
                              message,