chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pager: introduce "jump to end" option
[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 2e74a25972ddce27e7c4c6307e83533f414100e5..99a626c6c58ad960ccf1e762e0b5426182b08f83 100644
(file)
--- a/
src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/
src/tty-ask-password-agent/tty-ask-password-agent.c
@@
-315,8
+315,7
@@
static int parse_password(const char *filename, char **wall) {
*wall ? "\r\n\r\n" : "",
message,
pid) < 0) {
*wall ? "\r\n\r\n" : "",
message,
pid) < 0) {
- log_error("Out of memory");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
goto finish;
}
@@
-533,8
+532,7
@@
static int show_passwords(void) {
continue;
if (!(p = strappend("/run/systemd/ask-password/", de->d_name))) {
continue;
if (!(p = strappend("/run/systemd/ask-password/", de->d_name))) {
- log_error("Out of memory");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
goto finish;
}
@@
-690,7
+688,6
@@
static int parse_argv(int argc, char *argv[]) {
case ARG_VERSION:
puts(PACKAGE_STRING);
case ARG_VERSION:
puts(PACKAGE_STRING);
- puts(DISTRIBUTION);
puts(SYSTEMD_FEATURES);
return 0;
puts(SYSTEMD_FEATURES);
return 0;
@@
-738,6
+735,7
@@
static int parse_argv(int argc, char *argv[]) {
int main(int argc, char *argv[]) {
int r;
int main(int argc, char *argv[]) {
int r;
+ log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();
log_parse_environment();
log_open();