Package: systemd
Version: 25-1
Severity: important

At boot, systemd abort at dbus-manager.c lie 323 on assert(m) where
m is the manager passed via the "data" parameter.
This patch fix this issue by passing the dbus manager as data parameter in
bus_manager_message_handler. 
Issue introduced in commit bfebab7f69cb23f3a488f02bc2be9c8309808221 .


-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39-rc3test0-00240-ga1b49cb (SMP w/2 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages systemd depends on:
ii  initscripts                 2.88dsf-13.4 scripts for initializing and shutt
ii  libaudit0                   1.7.13-1+b2  Dynamic library for security audit
ii  libc6                       2.13-0exp5   Embedded GNU C Library: Shared lib
ii  libcap2                     1:2.20-1     support for getting/setting POSIX.
ii  libcryptsetup1              2:1.2.0-2    libcryptsetup shared library
ii  libdbus-1-3                 1.5.0-1      simple interprocess messaging syst
ii  libpam0g                    1.1.2-2      Pluggable Authentication Modules l
ii  libselinux1                 2.0.98-1     SELinux runtime shared libraries
ii  libudev0                    168-1        libudev shared library
ii  libwrap0                    7.6.q-19     Wietse Venema's TCP wrappers libra
ii  util-linux                  2.17.2-9.1   Miscellaneous system utilities

Versions of packages systemd recommends:
ii  libpam-systemd                25-1.1     system and service manager - PAM m

Versions of packages systemd suggests:
ii  python                        2.6.6-14   interactive high-level object-orie
ii  systemd-gui                   25-1.1     system and service manager - GUI

-- no debconf information
>From 583ae4427c5ee81682c8a81f92ef18d407b88cd9 Mon Sep 17 00:00:00 2001
From: Alban Browaeys <pra...@yahoo.com>
Date: Mon, 25 Apr 2011 15:55:43 +0200
Subject: [PATCH] Fix bus_manager_handler:

send manager "m" instead of null to bus_manager_append_n_jobs as it
expect the dbus manager as data nowadays.
Fix abort in systemd when calling this handler.
---
 src/dbus-manager.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/dbus-manager.c b/src/dbus-manager.c
index 4224afa..9776b0b 100644
--- a/src/dbus-manager.c
+++ b/src/dbus-manager.c
@@ -381,7 +381,7 @@ static DBusHandlerResult 
bus_manager_message_handler(DBusConnection *connection,
                 { "org.freedesktop.systemd1.Manager", "LogLevel",      
bus_manager_append_log_level,  "s",  m, bus_manager_set_log_level },
                 { "org.freedesktop.systemd1.Manager", "LogTarget",     
bus_manager_append_log_target, "s",  m, bus_manager_set_log_target },
                 { "org.freedesktop.systemd1.Manager", "NNames",        
bus_manager_append_n_names,    "u",  m                  },
-                { "org.freedesktop.systemd1.Manager", "NJobs",         
bus_manager_append_n_jobs,     "u",  NULL               },
+                { "org.freedesktop.systemd1.Manager", "NJobs",         
bus_manager_append_n_jobs,     "u",  m                  },
                 { "org.freedesktop.systemd1.Manager", 
"NInstalledJobs",bus_property_append_uint32,    "u",  &m->n_installed_jobs },
                 { "org.freedesktop.systemd1.Manager", "NFailedJobs",   
bus_property_append_uint32,    "u",  &m->n_failed_jobs  },
                 { "org.freedesktop.systemd1.Manager", "Progress",      
bus_manager_append_progress,   "d",  m                  },
-- 
1.7.5.rc3

Reply via email to