From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 18 Jul 2014 19:01:07 +0000 (+0200)
Subject: resolved: fix bus signatures to follow family as int change
X-Git-Tag: v216~498
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=878cd63db2d6cfc00ae4d68355a2d5402cd9f24f;p=elogind.git

resolved: fix bus signatures to follow family as int change
---

diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c
index c172022d7..5268fb763 100644
--- a/src/nss-resolve/nss-resolve.c
+++ b/src/nss-resolve/nss-resolve.c
@@ -131,7 +131,7 @@ enum nss_status _nss_resolve_gethostbyname4_r(
         if (r < 0)
                 goto fail;
 
-        r = sd_bus_message_append(req, "sy", name, AF_UNSPEC);
+        r = sd_bus_message_append(req, "si", name, AF_UNSPEC);
         if (r < 0)
                 goto fail;
 
@@ -297,7 +297,7 @@ enum nss_status _nss_resolve_gethostbyname3_r(
         if (r < 0)
                 goto fail;
 
-        r = sd_bus_message_append(req, "sy", name, af);
+        r = sd_bus_message_append(req, "si", name, af);
         if (r < 0)
                 goto fail;
 
diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c
index 11d94afad..5222cc81f 100644
--- a/src/resolve/resolved-bus.c
+++ b/src/resolve/resolved-bus.c
@@ -446,8 +446,8 @@ static int bus_method_resolve_address(sd_bus *bus, sd_bus_message *message, void
 
 static const sd_bus_vtable resolve_vtable[] = {
         SD_BUS_VTABLE_START(0),
-        SD_BUS_METHOD("ResolveHostname", "sy", "a(yayi)s", bus_method_resolve_hostname, SD_BUS_VTABLE_UNPRIVILEGED),
-        SD_BUS_METHOD("ResolveAddress", "yayi", "as", bus_method_resolve_address, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("ResolveHostname", "si", "a(iayi)s", bus_method_resolve_hostname, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("ResolveAddress", "iayi", "as", bus_method_resolve_address, SD_BUS_VTABLE_UNPRIVILEGED),
         SD_BUS_VTABLE_END,
 };