[rename] renamed kdbus related macros

[platform/upstream/dbus.git] / dbus / kdbus-common.c

diff --git a/dbus/kdbus-common.c b/dbus/kdbus-common.c
index 5651696..e0e6305 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;
 }
@@ -219,7 +219,7 @@ int release_kdbus_name(int fd, const char *name, __u64 id)
 
   if (ioctl(fd, KDBUS_CMD_NAME_RELEASE, cmd_name))
     {
-      if(errno == ESRCH)
+      if((errno == ESRCH) || (errno == ENXIO))
         return DBUS_RELEASE_NAME_REPLY_NON_EXISTENT;
       else if (errno == EPERM)
         return DBUS_RELEASE_NAME_REPLY_NOT_OWNER;