1 diff -u -Nr NetworkManager-0.9.3.995/configure.ac NetworkManager-0.9.3.995-systemd-fallback/configure.ac
2 --- NetworkManager-0.9.3.995/configure.ac 2012-03-02 01:05:21.000000000 +0100
3 +++ NetworkManager-0.9.3.995-systemd-fallback/configure.ac 2012-03-06 16:55:58.294793902 +0100
5 case $with_session_tracking in
8 - PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
9 + PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login])
12 AC_MSG_ERROR(--with-session-tracking must be one of [none, ck, systemd])
13 diff -u -Nr NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c
14 --- NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c 2012-02-27 16:57:16.000000000 +0100
15 +++ NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c 2012-03-06 16:55:01.285264295 +0100
17 #include <glib/gstdio.h>
18 #include <systemd/sd-login.h>
20 +#include <systemd/sd-daemon.h>
21 +#include <sys/stat.h>
23 +#include "nm-logging.h"
25 #include "nm-session-utils.h"
26 #include "nm-session-monitor.h"
31 +/********************************************************************/
33 +#define CKDB_PATH "/var/run/ConsoleKit/database"
35 struct _NMSessionMonitor {
36 GObject parent_instance;
41 + GFileMonitor *database_monitor;
42 + time_t database_mtime;
43 + GHashTable *sessions_by_uid;
44 + GHashTable *sessions_by_user;
47 struct _NMSessionMonitorClass {
50 /* ---------------------------------------------------------------------------------------------------- */
60 +session_free (Session *s)
63 + memset (s, 0, sizeof (Session));
68 +check_key (GKeyFile *keyfile, const char *group, const char *key, GError **error)
70 + if (g_key_file_has_key (keyfile, group, key, error))
75 + NM_SESSION_MONITOR_ERROR,
76 + NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE,
77 + "ConsoleKit database " CKDB_PATH " group '%s' had no '%s' key",
84 +session_new (GKeyFile *keyfile, const char *group, GError **error)
86 + GError *local = NULL;
88 + const char *uname = NULL;
90 + s = g_new0 (Session, 1);
93 + s->uid = G_MAXUINT; /* paranoia */
94 + if (!check_key (keyfile, group, "uid", &local))
96 + s->uid = (uid_t) g_key_file_get_integer (keyfile, group, "uid", &local);
100 + if (!check_key (keyfile, group, "is_active", &local))
102 + s->active = g_key_file_get_boolean (keyfile, group, "is_active", &local);
106 + if (!check_key (keyfile, group, "is_local", &local))
108 + s->local = g_key_file_get_boolean (keyfile, group, "is_local", &local);
112 + if (!nm_session_uid_to_user (s->uid, &uname, error))
114 + s->user = g_strdup (uname);
120 + g_propagate_error (error, local);
125 +session_merge (Session *src, Session *dest)
127 + g_return_if_fail (src != NULL);
128 + g_return_if_fail (dest != NULL);
130 + g_warn_if_fail (g_strcmp0 (src->user, dest->user) == 0);
131 + g_warn_if_fail (src->uid == dest->uid);
133 + dest->local = (dest->local || src->local);
134 + dest->active = (dest->active || src->active);
137 +/********************************************************************/
140 +free_database (NMSessionMonitor *self)
142 + if (self->database != NULL) {
143 + g_key_file_free (self->database);
144 + self->database = NULL;
147 + g_hash_table_remove_all (self->sessions_by_uid);
148 + g_hash_table_remove_all (self->sessions_by_user);
152 +reload_database (NMSessionMonitor *self, GError **error)
154 + struct stat statbuf;
155 + char **groups = NULL;
159 + free_database (self);
162 + if (stat (CKDB_PATH, &statbuf) != 0) {
163 + g_set_error (error,
164 + NM_SESSION_MONITOR_ERROR,
165 + errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR,
166 + "Error statting file " CKDB_PATH ": %s",
170 + self->database_mtime = statbuf.st_mtime;
172 + self->database = g_key_file_new ();
173 + if (!g_key_file_load_from_file (self->database, CKDB_PATH, G_KEY_FILE_NONE, error))
176 + groups = g_key_file_get_groups (self->database, &len);
178 + g_set_error_literal (error,
179 + NM_SESSION_MONITOR_ERROR,
180 + NM_SESSION_MONITOR_ERROR_IO_ERROR,
181 + "Could not load groups from " CKDB_PATH "");
185 + for (i = 0; i < len; i++) {
188 + if (!g_str_has_prefix (groups[i], "Session "))
191 + s = session_new (self->database, groups[i], error);
195 + found = g_hash_table_lookup (self->sessions_by_user, (gpointer) s->user);
197 + session_merge (s, found);
200 + /* Entirely new user */
201 + g_hash_table_insert (self->sessions_by_user, (gpointer) s->user, s);
202 + g_hash_table_insert (self->sessions_by_uid, GUINT_TO_POINTER (s->uid), s);
206 + g_strfreev (groups);
211 + g_strfreev (groups);
212 + free_database (self);
217 +ensure_database (NMSessionMonitor *self, GError **error)
219 + gboolean ret = FALSE;
221 + if (self->database != NULL) {
222 + struct stat statbuf;
225 + if (stat (CKDB_PATH, &statbuf) != 0) {
226 + g_set_error (error,
227 + NM_SESSION_MONITOR_ERROR,
228 + errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR,
229 + "Error statting file " CKDB_PATH " to check timestamp: %s",
234 + if (statbuf.st_mtime == self->database_mtime) {
240 + ret = reload_database (self, error);
247 +on_file_monitor_changed (GFileMonitor * file_monitor,
249 + GFile * other_file,
250 + GFileMonitorEvent event_type,
251 + gpointer user_data)
253 + NMSessionMonitor *self = NM_SESSION_MONITOR (user_data);
255 + /* throw away cache */
256 + free_database (self);
258 + g_signal_emit (self, signals[CHANGED_SIGNAL], 0);
262 sessions_changed (gpointer user_data)
266 nm_session_monitor_init (NMSessionMonitor *monitor)
268 - monitor->sd_source = sd_source_new ();
269 - g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
270 - g_source_attach (monitor->sd_source, NULL);
271 + if (sd_booted () > 0) {
272 + monitor->sd_source = sd_source_new ();
273 + g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
274 + g_source_attach (monitor->sd_source, NULL);
276 + monitor->database_monitor = NULL;
277 + monitor->database = NULL;
279 + monitor->sd_source = NULL;
281 + GError *error = NULL;
284 + /* Sessions-by-user is responsible for destroying the Session objects */
285 + monitor->sessions_by_user = g_hash_table_new_full (g_str_hash, g_str_equal,
286 + NULL, (GDestroyNotify) session_free);
287 + monitor->sessions_by_uid = g_hash_table_new (g_direct_hash, g_direct_equal);
291 + if (!ensure_database (monitor, &error)) {
292 + /* Ignore the first error if the CK database isn't found yet */
293 + if (g_error_matches (error,
294 + NM_SESSION_MONITOR_ERROR,
295 + NM_SESSION_MONITOR_ERROR_NO_DATABASE) == FALSE) {
296 + nm_log_err (LOGD_CORE, "Error loading " CKDB_PATH ": %s", error->message);
298 + g_error_free (error);
302 + file = g_file_new_for_path (CKDB_PATH);
303 + monitor->database_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error);
304 + g_object_unref (file);
305 + if (monitor->database_monitor == NULL) {
306 + nm_log_err (LOGD_CORE, "Error monitoring " CKDB_PATH ": %s", error->message);
307 + g_error_free (error);
309 + g_signal_connect (monitor->database_monitor,
311 + G_CALLBACK (on_file_monitor_changed),
319 g_source_unref (monitor->sd_source);
322 + if (monitor->database_monitor != NULL)
323 + g_object_unref (monitor->database_monitor);
325 + if (monitor->database != NULL)
326 + free_database (monitor);
328 if (G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize != NULL)
329 G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize (object);
331 @@ -206,15 +476,36 @@
336 + if (monitor->sd_source != NULL) {
339 - if (!nm_session_user_to_uid (username, &uid, error))
341 + if (!nm_session_user_to_uid (username, &uid, error))
349 - return nm_session_monitor_uid_has_session (monitor, uid, NULL, error);
350 + return nm_session_monitor_uid_has_session (monitor, uid, NULL, error);
354 + if (!ensure_database (monitor, error))
357 + s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username);
359 + g_set_error (error,
360 + NM_SESSION_MONITOR_ERROR,
361 + NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
362 + "No session found for user '%s'",
374 @@ -222,12 +513,31 @@
375 const char *username,
379 + if (monitor->sd_source != NULL) {
382 - if (!nm_session_user_to_uid (username, &uid, error))
384 + if (!nm_session_user_to_uid (username, &uid, error))
387 + return nm_session_monitor_uid_active (monitor, uid, error);
391 + if (!ensure_database (monitor, error))
394 + s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username);
396 + g_set_error (error,
397 + NM_SESSION_MONITOR_ERROR,
398 + NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
399 + "No session found for user '%s'",
404 - return nm_session_monitor_uid_active (monitor, uid, error);
410 @@ -236,10 +546,31 @@
411 const char **out_user,
414 - if (!nm_session_uid_to_user (uid, out_user, error))
416 + if (monitor->sd_source != NULL) {
417 + if (!nm_session_uid_to_user (uid, out_user, error))
420 - return sd_uid_get_sessions (uid, FALSE, NULL) > 0;
421 + return sd_uid_get_sessions (uid, FALSE, NULL) > 0;
425 + if (!ensure_database (monitor, error))
428 + s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid));
430 + g_set_error (error,
431 + NM_SESSION_MONITOR_ERROR,
432 + NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
433 + "No session found for uid %d",
439 + *out_user = s->user;
449 - return sd_uid_get_sessions (uid, TRUE, NULL) > 0;
450 + if (monitor->sd_source != NULL)
451 + return sd_uid_get_sessions (uid, TRUE, NULL) > 0;
455 + if (!ensure_database (monitor, error))
458 + s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid));
460 + g_set_error (error,
461 + NM_SESSION_MONITOR_ERROR,
462 + NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
463 + "No session found for uid '%d'",