[Daemon-fix][Upstream merge] Small fixes in daemon starting

Signed-off-by: Michal Eljasiewicz <m.eljasiewic@samsung.com>
Change-Id: Id0527a832cbaabda89b7e0f7a328ef0cde03aef5

diff --git a/autogen.sh b/autogen.sh
index a450272..76d5b0e 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -102,7 +102,7 @@ fi
 
 #--enable-developer --enable-verbose-mode 
 if $run_configure; then
-    $srcdir/configure --enable-abstract-sockets --config-cache "$@" || exit $?
+    $srcdir/configure --enable-abstract-sockets --config-cache --enable-doxygen-docs=no "$@" || exit $?
     echo 
     echo "Now type 'make' to compile $PROJECT."
 else

diff --git a/dbus/dbus-transport-kdbus.c b/dbus/dbus-transport-kdbus.c
index 27263ea..b95339c 100644 (file)
--- a/dbus/dbus-transport-kdbus.c
+++ b/dbus/dbus-transport-kdbus.c
@@ -518,6 +518,7 @@ static int kdbus_write_msg(DBusTransportKdbus *transport, DBusMessage *message,
 static dbus_bool_t bus_register_kdbus(char* name, DBusTransportKdbus* transportS)
 {
        struct kdbus_cmd_hello __attribute__ ((__aligned__(8))) hello;
+       memset(&hello, 0, sizeof(hello));
 
        hello.conn_flags = KDBUS_HELLO_ACCEPT_FD/* |
                           KDBUS_HELLO_ATTACH_COMM |

diff --git a/dbus/kdbus-common.c b/dbus/kdbus-common.c
index 5651696..a55be27 100644 (file)
--- a/dbus/kdbus-common.c
+++ b/dbus/kdbus-common.c
@@ -46,7 +46,7 @@ static struct kdbus_item *make_policy_name(const char *name)
   memset(p, 0, size);
   p->size = size;
   p->type = KDBUS_ITEM_POLICY_NAME;
-  strcpy(p->policy.name, name);
+  memcpy(p->policy.name, name, strlen(name) + 1);
 
   return p;
 }