[systemd-commits] 2 commits - Makefile.am src/systemctl

[Zbigniew Jędrzejewski-Szmek]

 Makefile.am               |    3 ++-
 src/systemctl/systemctl.c |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit d29dd033022b41794c7475a5ec4d9d683d18417e
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Wed Mar 13 21:59:11 2013 -0400

    build-sys: link libsystemd-login also against libsystemd-daemon-internal
    
    https://bugs.freedesktop.org/show_bug.cgi?id=62085
    
    /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libsystemd-login.so:
    undefined reference to `sd_listen_fds'
    
    In ee465038ce8 'build-sys: break dependency loop between
    libsystemd-id128.la and -shared.la', a partial fix was applied, and
    the use of functions from libsystemd-id128 was removed from
    libsystemd-shared. Nevertheless, fdset.c was still using sd_listen_fds,
    so libsystemd-login should be linked against libysystemd-daemon
    or libsystemd-daemon-internal.
    
    Tested-by: Elias Probst <mail at eliasprobst.eu>

diff --git a/Makefile.am b/Makefile.am
index a12e57e..175d14b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3356,7 +3356,8 @@ libsystemd_login_la_LDFLAGS = \
 	-Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
 
 libsystemd_login_la_LIBADD = \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	libsystemd-daemon-internal.la
 
 libsystemd_login_internal_la_SOURCES = \
 	$(libsystemd_login_la_SOURCES)

commit 1609dcb137813e8215d9ecc1f79c7dd7a788d5e0
Author: Michal Sekletar <msekleta at redhat.com>
Date:   Tue Mar 12 18:22:57 2013 +0100

    systemctl: remove unused variable

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 84b7c8e..1ea0e4e 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2053,7 +2053,7 @@ static int set_cgroup_attr(DBusConnection *bus, char **args) {
 }
 
 static int get_cgroup_attr(DBusConnection *bus, char **args) {
-        _cleanup_dbus_message_unref_ DBusMessage *m = NULL, *reply = NULL;
+        _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
         _cleanup_free_ char *n = NULL;
         char **argument;
         int r;