[systemd-commits] 3 commits - src/core src/libsystemd-bus

[Kay Sievers]

 src/core/automount.c        |    4 ++--
 src/core/unit.c             |    2 +-
 src/libsystemd-bus/kdbus.h  |   15 ++++++++-------
 src/libsystemd-bus/sd-bus.c |    2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit dd971bd2cef3e77cba28e52d7d51ec37035e3e61
Author: Kay Sievers <kay at vrfy.org>
Date:   Thu Nov 28 02:26:03 2013 +0100

    bus: update kdbus.h and always subscribe to KDBUS_HELLO_ATTACH_NAMES

diff --git a/src/libsystemd-bus/kdbus.h b/src/libsystemd-bus/kdbus.h
index 9b41638..3d21689 100644
--- a/src/libsystemd-bus/kdbus.h
+++ b/src/libsystemd-bus/kdbus.h
@@ -240,13 +240,14 @@ enum {
 	/* subscription for metadata to attach */
 	KDBUS_HELLO_ATTACH_TIMESTAMP	=  1 <<  8,
 	KDBUS_HELLO_ATTACH_CREDS	=  1 <<  9,
-	KDBUS_HELLO_ATTACH_COMM		=  1 << 10,
-	KDBUS_HELLO_ATTACH_EXE		=  1 << 11,
-	KDBUS_HELLO_ATTACH_CMDLINE	=  1 << 12,
-	KDBUS_HELLO_ATTACH_CGROUP	=  1 << 13,
-	KDBUS_HELLO_ATTACH_CAPS		=  1 << 14,
-	KDBUS_HELLO_ATTACH_SECLABEL	=  1 << 15,
-	KDBUS_HELLO_ATTACH_AUDIT	=  1 << 16,
+	KDBUS_HELLO_ATTACH_NAMES	=  1 << 10,
+	KDBUS_HELLO_ATTACH_COMM		=  1 << 11,
+	KDBUS_HELLO_ATTACH_EXE		=  1 << 12,
+	KDBUS_HELLO_ATTACH_CMDLINE	=  1 << 13,
+	KDBUS_HELLO_ATTACH_CGROUP	=  1 << 14,
+	KDBUS_HELLO_ATTACH_CAPS		=  1 << 15,
+	KDBUS_HELLO_ATTACH_SECLABEL	=  1 << 16,
+	KDBUS_HELLO_ATTACH_AUDIT	=  1 << 17,
 };
 
 struct kdbus_cmd_hello {
diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c
index f13e346..49a2abc 100644
--- a/src/libsystemd-bus/sd-bus.c
+++ b/src/libsystemd-bus/sd-bus.c
@@ -181,7 +181,7 @@ _public_ int sd_bus_new(sd_bus **ret) {
         r->n_ref = REFCNT_INIT;
         r->input_fd = r->output_fd = -1;
         r->message_version = 1;
-        r->hello_flags |= KDBUS_HELLO_ACCEPT_FD;
+        r->hello_flags |= KDBUS_HELLO_ACCEPT_FD|KDBUS_HELLO_ATTACH_NAMES;
         r->original_pid = getpid();
 
         assert_se(pthread_mutex_init(&r->memfd_cache_mutex, NULL) == 0);

commit 5acac4c814f973d1d47e5fbad1fa52cd3e92e7cf
Author: Kay Sievers <kay at vrfy.org>
Date:   Thu Nov 28 01:25:10 2013 +0100

    automount: log info about triggering process

diff --git a/src/core/automount.c b/src/core/automount.c
index 66e3d78..c6e0a74 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -773,8 +773,8 @@ static int automount_dispatch_io(sd_event_source *s, int fd, uint32_t events, vo
                         _cleanup_free_ char *p = NULL;
 
                         get_process_comm(packet.v5_packet.pid, &p);
-                        log_debug_unit(UNIT(a)->id,
-                                       "Got direct mount request on %s, triggered by %lu (%s)",
+                        log_info_unit(UNIT(a)->id,
+                                       "Got automount request for %s, triggered by %lu (%s)",
                                        a->where, (unsigned long) packet.v5_packet.pid, strna(p));
                 } else
                         log_debug_unit(UNIT(a)->id, "Got direct mount request on %s", a->where);

commit 28b99ccdcb43937123b170509558af6296a0d271
Author: Kay Sievers <kay at vrfy.org>
Date:   Thu Nov 28 01:24:56 2013 +0100

    core: initialize variable

diff --git a/src/core/unit.c b/src/core/unit.c
index d82408c..31d5f11 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2178,7 +2178,7 @@ void unit_serialize_item(Unit *u, FILE *f, const char *key, const char *value) {
 
 int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
         size_t offset;
-        ExecRuntime **rt;
+        ExecRuntime **rt = NULL;
         int r;
 
         assert(u);