systemd-fallback.patch

   1 --- NetworkManager-0.9.8.0/configure.ac~        2013-02-21 14:04:19.582661393 +0100
   2 +++ NetworkManager-0.9.8.0/configure.ac 2013-02-21 14:23:32.286416661 +0100
   3 @@ -283,7 +283,7 @@
   4  AM_CONDITIONAL(SESSION_TRACKING_CK, test "$with_session_tracking" = "consolekit")
   5  AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "xwith_session_tracking" = "systemd")
   6  if test "$with_session_tracking" = "systemd"; then
   7 -       PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login])
   8 +       PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-daemon libsystemd-login])
   9         AC_SUBST(SYSTEMD_LOGIN_CFLAGS)
  10         AC_SUBST(SYSTEMD_LOGIN_LIBS)
  11  fi
  12 --- NetworkManager-0.9.6.4/src/nm-session-monitor-systemd.c.orig        2012-09-12 22:37:01.000000000 +0200
  13 +++ NetworkManager-0.9.6.4/src/nm-session-monitor-systemd.c     2012-11-01 08:58:24.084129513 +0100
  14 @@ -28,6 +28,10 @@
  15  #include <glib/gstdio.h>
  16  #include <systemd/sd-login.h>
  17  #include <stdlib.h>
  18 +#include <systemd/sd-daemon.h>
  19 +#include <sys/stat.h>
  20 +#include <gio/gio.h>
  21 +#include "nm-logging.h"
  22
  23  #include "nm-session-utils.h"
  24  #include "nm-session-monitor.h"
  25 @@ -108,10 +112,20 @@
  26         return source;
  27  }
  28
  29 +/********************************************************************/
  30 +
  31 +#define CKDB_PATH "/var/run/ConsoleKit/database"
  32 +
  33  struct _NMSessionMonitor {
  34         GObject parent_instance;
  35
  36         GSource *sd_source;
  37 +
  38 +       GKeyFile *database;
  39 +       GFileMonitor *database_monitor;
  40 +       time_t database_mtime;
  41 +       GHashTable *sessions_by_uid;
  42 +       GHashTable *sessions_by_user;
  43  };
  44
  45  struct _NMSessionMonitorClass {
  46 @@ -131,6 +145,215 @@
  47
  48  /* ---------------------------------------------------------------------------------------------------- */
  49
  50 +typedef struct {
  51 +       char *user;
  52 +       uid_t uid;
  53 +       gboolean local;
  54 +       gboolean active;
  55 +} Session;
  56 +
  57 +static void
  58 +session_free (Session *s)
  59 +{
  60 +       g_free (s->user);
  61 +       memset (s, 0, sizeof (Session));
  62 +       g_free (s);
  63 +}
  64 +
  65 +static gboolean
  66 +check_key (GKeyFile *keyfile, const char *group, const char *key, GError **error)
  67 +{
  68 +       if (g_key_file_has_key (keyfile, group, key, error))
  69 +               return TRUE;
  70 +
  71 +       if (!error) {
  72 +               g_set_error (error,
  73 +                                NM_SESSION_MONITOR_ERROR,
  74 +                                NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE,
  75 +                                "ConsoleKit database " CKDB_PATH " group '%s' had no '%s' key",
  76 +                                group, key);
  77 +       }
  78 +       return FALSE;
  79 +}
  80 +
  81 +static Session *
  82 +session_new (GKeyFile *keyfile, const char *group, GError **error)
  83 +{
  84 +       GError *local = NULL;
  85 +       Session *s;
  86 +       const char *uname = NULL;
  87 +
  88 +       s = g_new0 (Session, 1);
  89 +       g_assert (s);
  90 +
  91 +       s->uid = G_MAXUINT; /* paranoia */
  92 +       if (!check_key (keyfile, group, "uid", &local))
  93 +               goto error;
  94 +       s->uid = (uid_t) g_key_file_get_integer (keyfile, group, "uid", &local);
  95 +       if (local)
  96 +               goto error;
  97 +
  98 +       if (!check_key (keyfile, group, "is_active", &local))
  99 +               goto error;
 100 +       s->active = g_key_file_get_boolean (keyfile, group, "is_active", &local);
 101 +       if (local)
 102 +               goto error;
 103 +
 104 +       if (!check_key (keyfile, group, "is_local", &local))
 105 +               goto error;
 106 +       s->local = g_key_file_get_boolean (keyfile, group, "is_local", &local);
 107 +       if (local)
 108 +               goto error;
 109 +
 110 +       if (!nm_session_uid_to_user (s->uid, &uname, error))
 111 +               return FALSE;
 112 +       s->user = g_strdup (uname);
 113 +
 114 +       return s;
 115 +
 116 +error:
 117 +       session_free (s);
 118 +       g_propagate_error (error, local);
 119 +       return NULL;
 120 +}
 121 +
 122 +static void
 123 +session_merge (Session *src, Session *dest)
 124 +{
 125 +       g_return_if_fail (src != NULL);
 126 +       g_return_if_fail (dest != NULL);
 127 +
 128 +       g_warn_if_fail (g_strcmp0 (src->user, dest->user) == 0);
 129 +       g_warn_if_fail (src->uid == dest->uid);
 130 +
 131 +       dest->local = (dest->local || src->local);
 132 +       dest->active = (dest->active || src->active);
 133 +}
 134 +
 135 +/********************************************************************/
 136 +
 137 +static void
 138 +free_database (NMSessionMonitor *self)
 139 +{
 140 +       if (self->database != NULL) {
 141 +               g_key_file_free (self->database);
 142 +               self->database = NULL;
 143 +       }
 144 +
 145 +       g_hash_table_remove_all (self->sessions_by_uid);
 146 +       g_hash_table_remove_all (self->sessions_by_user);
 147 +}
 148 +
 149 +static gboolean
 150 +reload_database (NMSessionMonitor *self, GError **error)
 151 +{
 152 +       struct stat statbuf;
 153 +       char **groups = NULL;
 154 +       gsize len = 0, i;
 155 +       Session *s;
 156 +
 157 +       free_database (self);
 158 +
 159 +       errno = 0;
 160 +       if (stat (CKDB_PATH, &statbuf) != 0) {
 161 +               g_set_error (error,
 162 +                            NM_SESSION_MONITOR_ERROR,
 163 +                            errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR,
 164 +                            "Error statting file " CKDB_PATH ": %s",
 165 +                            strerror (errno));
 166 +               goto error;
 167 +       }
 168 +       self->database_mtime = statbuf.st_mtime;
 169 +
 170 +       self->database = g_key_file_new ();
 171 +       if (!g_key_file_load_from_file (self->database, CKDB_PATH, G_KEY_FILE_NONE, error))
 172 +               goto error;
 173 +
 174 +       groups = g_key_file_get_groups (self->database, &len);
 175 +       if (!groups) {
 176 +               g_set_error_literal (error,
 177 +                                    NM_SESSION_MONITOR_ERROR,
 178 +                                    NM_SESSION_MONITOR_ERROR_IO_ERROR,
 179 +                                    "Could not load groups from " CKDB_PATH "");
 180 +               goto error;
 181 +       }
 182 +
 183 +       for (i = 0; i < len; i++) {
 184 +               Session *found;
 185 +
 186 +               if (!g_str_has_prefix (groups[i], "Session "))
 187 +                       continue;
 188 +
 189 +               s = session_new (self->database, groups[i], error);
 190 +               if (!s)
 191 +                       goto error;
 192 +
 193 +               found = g_hash_table_lookup (self->sessions_by_user, (gpointer) s->user);
 194 +               if (found) {
 195 +                       session_merge (s, found);
 196 +                       session_free (s);
 197 +               } else {
 198 +                       /* Entirely new user */
 199 +                       g_hash_table_insert (self->sessions_by_user, (gpointer) s->user, s);
 200 +                       g_hash_table_insert (self->sessions_by_uid, GUINT_TO_POINTER (s->uid), s);
 201 +               }
 202 +       }
 203 +
 204 +       g_strfreev (groups);
 205 +       return TRUE;
 206 +
 207 +error:
 208 +       if (groups)
 209 +               g_strfreev (groups);
 210 +       free_database (self);
 211 +       return FALSE;
 212 +}
 213 +
 214 +static gboolean
 215 +ensure_database (NMSessionMonitor *self, GError **error)
 216 +{
 217 +       gboolean ret = FALSE;
 218 +
 219 +       if (self->database != NULL) {
 220 +               struct stat statbuf;
 221 +
 222 +               errno = 0;
 223 +               if (stat (CKDB_PATH, &statbuf) != 0) {
 224 +                       g_set_error (error,
 225 +                                    NM_SESSION_MONITOR_ERROR,
 226 +                                    errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR,
 227 +                                    "Error statting file " CKDB_PATH " to check timestamp: %s",
 228 +                                    strerror (errno));
 229 +                       goto out;
 230 +               }
 231 +
 232 +               if (statbuf.st_mtime == self->database_mtime) {
 233 +                       ret = TRUE;
 234 +                       goto out;
 235 +               }
 236 +       }
 237 +
 238 +       ret = reload_database (self, error);
 239 +
 240 +out:
 241 +       return ret;
 242 +}
 243 +
 244 +static void
 245 +on_file_monitor_changed (GFileMonitor *    file_monitor,
 246 +                         GFile *           file,
 247 +                         GFile *           other_file,
 248 +                         GFileMonitorEvent event_type,
 249 +                         gpointer          user_data)
 250 +{
 251 +       NMSessionMonitor *self = NM_SESSION_MONITOR (user_data);
 252 +
 253 +       /* throw away cache */
 254 +       free_database (self);
 255 +
 256 +       g_signal_emit (self, signals[CHANGED_SIGNAL], 0);
 257 +}
 258 +
 259  static gboolean
 260  sessions_changed (gpointer user_data)
 261  {
 262 @@ -144,9 +367,50 @@
 263  static void
 264  nm_session_monitor_init (NMSessionMonitor *monitor)
 265  {
 266 -       monitor->sd_source = sd_source_new ();
 267 -       g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
 268 -       g_source_attach (monitor->sd_source, NULL);
 269 +       if (sd_booted () > 0) {
 270 +               monitor->sd_source = sd_source_new ();
 271 +               g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
 272 +               g_source_attach (monitor->sd_source, NULL);
 273 +
 274 +               monitor->database_monitor = NULL;
 275 +               monitor->database = NULL;
 276 +       } else {
 277 +               monitor->sd_source = NULL;
 278 +
 279 +               GError *error = NULL;
 280 +               GFile *file;
 281 +
 282 +               /* Sessions-by-user is responsible for destroying the Session objects */
 283 +               monitor->sessions_by_user = g_hash_table_new_full (g_str_hash, g_str_equal,
 284 +                                                               NULL, (GDestroyNotify) session_free);
 285 +               monitor->sessions_by_uid = g_hash_table_new (g_direct_hash, g_direct_equal);
 286 +
 287 +
 288 +               error = NULL;
 289 +               if (!ensure_database (monitor, &error)) {
 290 +                       /* Ignore the first error if the CK database isn't found yet */
 291 +                       if (g_error_matches (error,
 292 +                                            NM_SESSION_MONITOR_ERROR,
 293 +                                            NM_SESSION_MONITOR_ERROR_NO_DATABASE) == FALSE) {
 294 +                               nm_log_err (LOGD_CORE, "Error loading " CKDB_PATH ": %s", error->message);
 295 +                       }
 296 +                       g_error_free (error);
 297 +               }
 298 +
 299 +               error = NULL;
 300 +               file = g_file_new_for_path (CKDB_PATH);
 301 +               monitor->database_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error);
 302 +               g_object_unref (file);
 303 +               if (monitor->database_monitor == NULL) {
 304 +                       nm_log_err (LOGD_CORE, "Error monitoring " CKDB_PATH ": %s", error->message);
 305 +                       g_error_free (error);
 306 +               } else {
 307 +                       g_signal_connect (monitor->database_monitor,
 308 +                                         "changed",
 309 +                                         G_CALLBACK (on_file_monitor_changed),
 310 +                                         monitor);
 311 +               }
 312 +       }
 313  }
 314
 315  static void
 316 @@ -159,6 +423,12 @@
 317                 g_source_unref (monitor->sd_source);
 318         }
 319
 320 +       if (monitor->database_monitor != NULL)
 321 +               g_object_unref (monitor->database_monitor);
 322 +
 323 +       if (monitor->database != NULL)
 324 +               free_database (monitor);
 325 +
 326         if (G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize != NULL)
 327                 G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize (object);
 328  }
 329 @@ -207,15 +477,36 @@
 330                                       uid_t *out_uid,
 331                                       GError **error)
 332  {
 333 -       uid_t uid;
 334 +       if (monitor->sd_source != NULL) {
 335 +               uid_t uid;
 336
 337 -       if (!nm_session_user_to_uid (username, &uid, error))
 338 -               return FALSE;
 339 +               if (!nm_session_user_to_uid (username, &uid, error))
 340 +                       return FALSE;
 341
 342 -       if (out_uid)
 343 -               *out_uid = uid;
 344 +               if (out_uid)
 345 +                       *out_uid = uid;
 346
 347 -       return nm_session_monitor_uid_has_session (monitor, uid, NULL, error);
 348 +               return nm_session_monitor_uid_has_session (monitor, uid, NULL, error);
 349 +       } else {
 350 +               Session *s;
 351 +
 352 +               if (!ensure_database (monitor, error))
 353 +                       return FALSE;
 354 +
 355 +               s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username);
 356 +               if (!s) {
 357 +                       g_set_error (error,
 358 +                                    NM_SESSION_MONITOR_ERROR,
 359 +                                    NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
 360 +                                    "No session found for user '%s'",
 361 +                                    username);
 362 +                       return FALSE;
 363 +               }
 364 +
 365 +               if (out_uid)
 366 +                       *out_uid = s->uid;
 367 +               return TRUE;
 368 +       }
 369  }
 370
 371  gboolean
 372 @@ -223,12 +514,31 @@
 373                                  const char *username,
 374                                  GError **error)
 375  {
 376 -       uid_t uid;
 377 +       if (monitor->sd_source != NULL) {
 378 +               uid_t uid;
 379
 380 -       if (!nm_session_user_to_uid (username, &uid, error))
 381 -               return FALSE;
 382 +               if (!nm_session_user_to_uid (username, &uid, error))
 383 +                       return FALSE;
 384
 385 -       return nm_session_monitor_uid_active (monitor, uid, error);
 386 +               return nm_session_monitor_uid_active (monitor, uid, error);
 387 +       } else {
 388 +               Session *s;
 389 +
 390 +               if (!ensure_database (monitor, error))
 391 +                       return FALSE;
 392 +
 393 +               s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username);
 394 +               if (!s) {
 395 +                       g_set_error (error,
 396 +                                    NM_SESSION_MONITOR_ERROR,
 397 +                                    NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
 398 +                                    "No session found for user '%s'",
 399 +                                    username);
 400 +                       return FALSE;
 401 +               }
 402 +
 403 +               return s->active;
 404 +       }
 405  }
 406
 407  gboolean
 408 @@ -239,16 +549,37 @@
 409  {
 410         int ret;
 411
 412 -       if (!nm_session_uid_to_user (uid, out_user, error))
 413 -               return FALSE;
 414 +       if (monitor->sd_source != NULL) {
 415 +               if (!nm_session_uid_to_user (uid, out_user, error))
 416 +                       return FALSE;
 417
 418 -       ret = sd_uid_get_sessions (uid, FALSE, NULL) > 0;
 419 -       if (ret < 0) {
 420 -               nm_log_warn (LOGD_CORE, "Failed to get systemd sessions for uid %d: %d",
 421 -                            uid, ret);
 422 -               return FALSE;
 423 +               ret = sd_uid_get_sessions (uid, FALSE, NULL) > 0;
 424 +               if (ret < 0) {
 425 +                       nm_log_warn (LOGD_CORE, "Failed to get systemd sessions for uid %d: %d",
 426 +                                    uid, ret);
 427 +                       return FALSE;
 428 +               }
 429 +               return ret > 0 ? TRUE : FALSE;
 430 +       } else {
 431 +               Session *s;
 432 +
 433 +               if (!ensure_database (monitor, error))
 434 +                       return FALSE;
 435 +
 436 +               s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid));
 437 +               if (!s) {
 438 +                       g_set_error (error,
 439 +                                    NM_SESSION_MONITOR_ERROR,
 440 +                                    NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
 441 +                                    "No session found for uid %d",
 442 +                                    uid);
 443 +                       return FALSE;
 444 +               }
 445 +
 446 +               if (out_user)
 447 +                       *out_user = s->user;
 448 +               return TRUE;
 449         }
 450 -       return ret > 0 ? TRUE : FALSE;
 451  }
 452
 453  gboolean
 454 @@ -258,11 +589,30 @@
 455  {
 456         int ret;
 457
 458 -       ret = sd_uid_get_sessions (uid, TRUE, NULL) > 0;
 459 -       if (ret < 0) {
 460 -               nm_log_warn (LOGD_CORE, "Failed to get active systemd sessions for uid %d: %d",
 461 -                            uid, ret);
 462 -               return FALSE;
 463 +       if (monitor->sd_source != NULL) {
 464 +               ret = sd_uid_get_sessions (uid, TRUE, NULL) > 0;
 465 +               if (ret < 0) {
 466 +                       nm_log_warn (LOGD_CORE, "Failed to get active systemd sessions for uid %d: %d",
 467 +                                    uid, ret);
 468 +                       return FALSE;
 469 +               }
 470 +               return ret > 0 ? TRUE : FALSE;
 471 +       } else {
 472 +               Session *s;
 473 +
 474 +               if (!ensure_database (monitor, error))
 475 +                       return FALSE;
 476 +
 477 +               s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid));
 478 +               if (!s) {
 479 +                       g_set_error (error,
 480 +                                    NM_SESSION_MONITOR_ERROR,
 481 +                                    NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
 482 +                                    "No session found for uid '%d'",
 483 +                                    uid);
 484 +                       return FALSE;
 485 +               }
 486 +
 487 +               return s->active;
 488         }
 489 -       return ret > 0 ? TRUE : FALSE;
 490  }
 491
 492 --- NetworkManager-0.9.8.0/src/nm-sleep-monitor-systemd.c.new   2013-02-21 15:01:09.404910471 +0100
 493 +++ NetworkManager-0.9.8.0/src/nm-sleep-monitor-systemd.c       2013-02-21 15:10:58.429453872 +0100
 494 @@ -25,6 +25,7 @@
 495  #include <dbus/dbus-glib.h>
 496  #include <gio/gio.h>
 497  #include <gio/gunixfdlist.h>
 498 +#include <systemd/sd-daemon.h>
 499
 500  #include "nm-logging.h"
 501  #include "nm-dbus-manager.h"
 502 @@ -35,6 +36,8 @@
 503  #define SD_PATH              "/org/freedesktop/login1"
 504  #define SD_INTERFACE         "org.freedesktop.login1.Manager"
 505
 506 +#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
 507 +
 508  /* Do we have GDBus (glib >= 2.26) and GUnixFDList (glib >= 2.30) support ? */
 509  #if GLIB_CHECK_VERSION(2,30,0)
 510  #define IS_GDBUS_UNIXFD_AVAILABLE 1
 511 @@ -50,6 +53,8 @@ struct _NMSleepMonitor {
 512         DBusGProxy *sd_proxy;
 513  #endif
 514         gint inhibit_fd;
 515 +
 516 +       DBusGProxy *upower_proxy;
 517  };
 518
 519  struct _NMSleepMonitorClass {
 520 @@ -71,6 +76,20 @@ G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_
 521
 522  /********************************************************************/
 523
 524 +static void
 525 +upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
 526 +{
 527 +        nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
 528 +        g_signal_emit (user_data, signals[SLEEPING], 0);
 529 +}
 530 +
 531 +static void
 532 +upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
 533 +{
 534 +        nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
 535 +        g_signal_emit (user_data, signals[RESUMING], 0);
 536 +}
 537 +
 538  static gboolean
 539  drop_inhibitor (NMSleepMonitor *self)
 540  {
 541 @@ -304,9 +323,34 @@ sleep_setup (NMSleepMonitor *self)
 542  static void
 543  nm_sleep_monitor_init (NMSleepMonitor *self)
 544  {
 545 -       self->inhibit_fd = -1;
 546 -       sleep_setup (self);
 547 -       take_inhibitor (self);
 548 +       if (sd_booted () > 0) {
 549 +               self->inhibit_fd = -1;
 550 +               sleep_setup (self);
 551 +               take_inhibitor (self);
 552 +       } else {
 553 +               NMDBusManager *dbus_mgr;
 554 +               DBusGConnection *bus;
 555 +
 556 +               dbus_mgr = nm_dbus_manager_get ();
 557 +        bus = nm_dbus_manager_get_connection (dbus_mgr);
 558 +        self->upower_proxy = dbus_g_proxy_new_for_name (bus,
 559 +                                                        UPOWER_DBUS_SERVICE,
 560 +                                                        "/org/freedesktop/UPower",
 561 +                                                        "org.freedesktop.UPower");
 562 +        if (self->upower_proxy) {
 563 +                       dbus_g_proxy_add_signal (self->upower_proxy, "Sleeping", G_TYPE_INVALID);
 564 +                       dbus_g_proxy_connect_signal (self->upower_proxy, "Sleeping",
 565 +                                                                                G_CALLBACK (upower_sleeping_cb),
 566 +                                                                                self, NULL);
 567 +
 568 +                       dbus_g_proxy_add_signal (self->upower_proxy, "Resuming", G_TYPE_INVALID);
 569 +                       dbus_g_proxy_connect_signal (self->upower_proxy, "Resuming",
 570 +                                                                                G_CALLBACK (upower_resuming_cb),
 571 +                                                                                self, NULL);
 572 +        } else
 573 +                               nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
 574 +        g_object_unref (dbus_mgr);
 575 +       }
 576  }
 577
 578  static void
 579 @@ -314,9 +358,14 @@ finalize (GObject *object)
 580  {
 581         NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
 582
 583 -       drop_inhibitor (self);
 584 -       if (self->sd_proxy)
 585 -               g_object_unref (self->sd_proxy);
 586 +       if (sd_booted () > 0) {
 587 +               drop_inhibitor (self);
 588 +               if (self->sd_proxy)
 589 +                       g_object_unref (self->sd_proxy);
 590 +       } else {
 591 +               if (self->upower_proxy)
 592 +                       g_object_unref (self->upower_proxy);
 593 +       }
 594
 595         if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
 596                 G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);