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: don't hit assert when we try to free NULL manager object
[elogind.git]
/
src
/
login
/
logind.c
diff --git
a/src/login/logind.c
b/src/login/logind.c
index e0f391f4165b01a021de97b7db8972c82f62ccde..774fd69dd8a6376921c735137285e64a6d7ea8c5 100644
(file)
--- a/
src/login/logind.c
+++ b/
src/login/logind.c
@@
-42,7
+42,6
@@
#include "signal-util.h"
#include "strv.h"
#include "udev-util.h"
#include "signal-util.h"
#include "strv.h"
#include "udev-util.h"
-
/// Additional includes needed by elogind
#include "cgroup.h" // From src/core/
#include "elogind.h"
/// Additional includes needed by elogind
#include "cgroup.h" // From src/core/
#include "elogind.h"
@@
-52,7
+51,6
@@
static void manager_free(Manager *m);
static void manager_reset_config(Manager *m) {
static void manager_free(Manager *m);
static void manager_reset_config(Manager *m) {
-
#if 0 /// elogind does not support autospawning of vts
m->n_autovts = 6;
m->reserve_vt = 6;
#if 0 /// elogind does not support autospawning of vts
m->n_autovts = 6;
m->reserve_vt = 6;
@@
-83,7
+81,6
@@
static void manager_reset_config(Manager *m) {
m->kill_only_users = strv_free(m->kill_only_users);
m->kill_exclude_users = strv_free(m->kill_exclude_users);
m->kill_only_users = strv_free(m->kill_only_users);
m->kill_exclude_users = strv_free(m->kill_exclude_users);
-
#if 1 /// elogind needs an Add-On for sleep configuration
elogind_manager_reset_config(m);
#endif // 1
#if 1 /// elogind needs an Add-On for sleep configuration
elogind_manager_reset_config(m);
#endif // 1
@@
-122,7
+119,6
@@
static Manager *manager_new(void) {
if (r < 0)
goto fail;
#endif // 1
if (r < 0)
goto fail;
#endif // 1
-
m->udev = udev_new();
if (!m->udev)
goto fail;
m->udev = udev_new();
if (!m->udev)
goto fail;
@@
-150,7
+146,8
@@
static void manager_free(Manager *m) {
Inhibitor *i;
Button *b;
Inhibitor *i;
Button *b;
- assert(m);
+ if (!m)
+ return;
while ((session = hashmap_first(m->sessions)))
session_free(session);
while ((session = hashmap_first(m->sessions)))
session_free(session);
@@
-213,7
+210,6
@@
static void manager_free(Manager *m) {
#if 0 /// elogind does not support autospawning of vts
safe_close(m->reserve_vt_fd);
#endif // 0
#if 0 /// elogind does not support autospawning of vts
safe_close(m->reserve_vt_fd);
#endif // 0
-
#if 1 /// elogind has to free its own data
elogind_manager_free(m);
#endif // 1
#if 1 /// elogind has to free its own data
elogind_manager_free(m);
#endif // 1
@@
-731,12
+727,14
@@
static int manager_connect_bus(Manager *m) {
if (r < 0)
return log_error_errno(r, "Failed to attach bus to event loop: %m");
if (r < 0)
return log_error_errno(r, "Failed to attach bus to event loop: %m");
-#if 1 /// elogind has to setup its release agent
+#if 0 /// elogind has to setup its release agent
+ return 0;
+#else
elogind_bus_setup_system(m);
r = elogind_setup_cgroups_agent(m);
elogind_bus_setup_system(m);
r = elogind_setup_cgroups_agent(m);
-#endif // 1
return r;
return r;
+#endif // 0
}
static int manager_vt_switch(sd_event_source *src, const struct signalfd_siginfo *si, void *data) {
}
static int manager_vt_switch(sd_event_source *src, const struct signalfd_siginfo *si, void *data) {
@@
-1210,12
+1208,15
@@
int main(int argc, char *argv[]) {
log_set_target(LOG_TARGET_AUTO);
log_set_facility(LOG_AUTH);
log_parse_environment();
log_set_target(LOG_TARGET_AUTO);
log_set_facility(LOG_AUTH);
log_parse_environment();
- log_open();
#ifdef ENABLE_DEBUG_ELOGIND
log_set_max_level(LOG_DEBUG);
#ifdef ENABLE_DEBUG_ELOGIND
log_set_max_level(LOG_DEBUG);
+ log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
#endif // ENABLE_DEBUG_ELOGIND
#endif // ENABLE_DEBUG_ELOGIND
+ log_open();
+
+
umask(0022);
if (argc != 1) {
umask(0022);
if (argc != 1) {
@@
-1286,8
+1287,7
@@
finish:
"STOPPING=1\n"
"STATUS=Shutting down...");
"STOPPING=1\n"
"STATUS=Shutting down...");
- if (m)
- manager_free(m);
+ manager_free(m);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}