chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: port logind to libsystemd-bus
[elogind.git]
/
src
/
tty-ask-password-agent
/
tty-ask-password-agent.c
diff --git
a/src/tty-ask-password-agent/tty-ask-password-agent.c
b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 3f5706ee3cd32deebee36ba835c233ccb6ca3d5a..f463662d6b2f4e948e8d4b5a6728683d37ac9286 100644
(file)
--- a/
src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/
src/tty-ask-password-agent/tty-ask-password-agent.c
@@
-275,7
+275,7
@@
static int parse_password(const char *filename, char **wall) {
return -errno;
}
return -errno;
}
- r = config_parse(
filename, f, NULL, config_item_table_lookup, (void*) items, tru
e, NULL);
+ r = config_parse(
NULL, filename, f, NULL, config_item_table_lookup, (void*) items, true, fals
e, NULL);
if (r < 0) {
log_error("Failed to parse password file %s: %s", filename, strerror(-r));
goto finish;
if (r < 0) {
log_error("Failed to parse password file %s: %s", filename, strerror(-r));
goto finish;
@@
-339,7
+339,7
@@
static int parse_password(const char *filename, char **wall) {
}
if (arg_plymouth) {
}
if (arg_plymouth) {
- char **passwords = NULL;
+
_cleanup_strv_free_
char **passwords = NULL;
if ((r = ask_password_plymouth(message, not_after, filename, accept_cached, &passwords)) >= 0) {
char **p;
if ((r = ask_password_plymouth(message, not_after, filename, accept_cached, &passwords)) >= 0) {
char **p;