X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind.c;h=73ba53d5b3270777217573ee7782f92eed9adabe;hp=78753bca495895b6f0a9ddbcec1cbd55fcd4b33c;hb=c7ec9e23fbb4203302389cf3a8a8da920e2a981f;hpb=3a35bb2809b93b2426bdf194c16cdcc1d9a65447 diff --git a/src/login/logind.c b/src/login/logind.c index 78753bca4..73ba53d5b 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -33,6 +33,7 @@ #include "logind.h" #include "udev-util.h" #include "formats-util.h" +#include "label.h" static void manager_free(Manager *m); @@ -636,7 +637,7 @@ static int manager_connect_bus(Manager *m) { if (r < 0) return log_error_errno(r, "Failed to add match for NameOwnerChanged: %m"); - r = sd_bus_add_match(m->bus, + r = sd_bus_add_match(m->bus, NULL, "type='signal'," "sender='org.freedesktop.systemd1'," @@ -678,7 +679,7 @@ static int manager_connect_bus(Manager *m) { match_reloading, m); if (r < 0) return log_error_errno(r, "Failed to add match for Reloading: %m"); - +#if 0 r = sd_bus_call_method( m->bus, "org.freedesktop.systemd1", @@ -691,7 +692,7 @@ static int manager_connect_bus(Manager *m) { log_error("Failed to enable subscription: %s", bus_error_message(&error, r)); return r; } - +#endif // 0 r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0); if (r < 0) return log_error_errno(r, "Failed to register name: %m"); @@ -1169,7 +1170,7 @@ int main(int argc, char *argv[]) { goto finish; } - log_debug("logind running as pid "PID_FMT, getpid()); + log_debug("systemd-logind running as pid "PID_FMT, getpid()); sd_notify(false, "READY=1\n" @@ -1177,7 +1178,7 @@ int main(int argc, char *argv[]) { r = manager_run(m); - log_debug("logind stopped as pid "PID_FMT, getpid()); + log_debug("systemd-logind stopped as pid "PID_FMT, getpid()); finish: sd_notify(false,