diff options
| -rw-r--r-- | src/login/pam-module.c | 13 | ||||
| -rw-r--r-- | src/run/run.c | 26 |
2 files changed, 19 insertions, 20 deletions
diff --git a/src/login/pam-module.c b/src/login/pam-module.c index f469244118..1975d8038d 100644 --- a/src/login/pam-module.c +++ b/src/login/pam-module.c @@ -40,6 +40,7 @@ #include "def.h" #include "socket-util.h" #include "fileio.h" +#include "bus-error.h" static int parse_argv(pam_handle_t *handle, int argc, const char **argv, @@ -355,11 +356,7 @@ _public_ PAM_EXTERN int pam_sm_open_session( remote_host, 0); if (r < 0) { - pam_syslog(handle, LOG_ERR, "Failed to communicate with systemd-logind: %s", strerror(-r)); - if (error.name || error.message) - pam_syslog(handle, LOG_ERR, "systemd-logind returned %s: %s", - error.name ?: "unknown error", - error.message ?: "no message"); + pam_syslog(handle, LOG_ERR, "Failed to create session: %s", bus_error_message(&error, r)); return PAM_SYSTEM_ERR; } @@ -482,11 +479,7 @@ _public_ PAM_EXTERN int pam_sm_close_session( id); if (r < 0) { pam_syslog(handle, LOG_ERR, - "Failed to release session: %s", strerror(-r)); - if (error.name || error.message) - pam_syslog(handle, LOG_ERR, "systemd-logind returned %s: %s", - error.name ?: "unknown error", - error.message ?: "no message"); + "Failed to release session: %s", bus_error_message(&error, r)); r = PAM_SESSION_ERR; goto finish; diff --git a/src/run/run.c b/src/run/run.c index f4c7005089..1eeb5c6e56 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -178,6 +178,10 @@ static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bu _cleanup_bus_message_unref_ sd_bus_message *m = NULL; int r; + assert(bus); + assert(name); + assert(ret); + log_info("Running as unit %s.", name); r = sd_bus_message_new_method_call( @@ -226,6 +230,9 @@ static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bu static int message_start_transient_unit_send(sd_bus *bus, sd_bus_message *m, sd_bus_error *error, sd_bus_message **reply) { int r; + assert(bus); + assert(m); + r = sd_bus_message_close_container(m); if (r < 0) return r; @@ -238,7 +245,7 @@ static int start_transient_service( char **argv, sd_bus_error *error) { - _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL; + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; _cleanup_free_ char *name = NULL; char **i; int r; @@ -316,7 +323,7 @@ static int start_transient_service( if (r < 0) return r; - return message_start_transient_unit_send(bus, m, error, &reply); + return message_start_transient_unit_send(bus, m, error, NULL); } static int start_transient_scope( @@ -324,10 +331,12 @@ static int start_transient_scope( char **argv, sd_bus_error *error) { - _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL; + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; _cleanup_free_ char *name = NULL; int r; + assert(bus); + if (arg_unit) name = unit_name_mangle_with_suffix(arg_unit, ".scope"); else @@ -343,7 +352,7 @@ static int start_transient_scope( if (r < 0) return r; - r = message_start_transient_unit_send(bus, m, error, &reply); + r = message_start_transient_unit_send(bus, m, error, NULL); if (r < 0) return r; @@ -353,7 +362,7 @@ static int start_transient_scope( } int main(int argc, char* argv[]) { - sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_bus_unref_ sd_bus *bus = NULL; _cleanup_free_ char *description = NULL, *command = NULL; int r; @@ -392,11 +401,8 @@ int main(int argc, char* argv[]) { r = start_transient_scope(bus, argv + optind, &error); else r = start_transient_service(bus, argv + optind, &error); - if (r < 0) { - log_error("Failed start transient unit: %s", error.message ? error.message : strerror(-r)); - sd_bus_error_free(&error); - goto finish; - } + if (r < 0) + log_error("Failed start transient unit: %s", bus_error_message(&error, r)); finish: return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; |