social: guest_enter_by_name(); zone_add_pkey(); join_msg fixes

2 files changed, 2 insertions, 1 deletions

diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c
index a9b15cef1..fbf3c159c 100644
--- a/src/multicast/gnunet-service-multicast.c
+++ b/src/multicast/gnunet-service-multicast.c
@@ -807,7 +807,7 @@ client_recv_member_join (void *cls, struct GNUNET_SERVER_Client *client,
   else if (grp->clients_head == grp->clients_tail)
   { /* First client of the group, send join request. */
     struct GNUNET_PeerIdentity *relays = (struct GNUNET_PeerIdentity *) &msg[1];
-    uint32_t relay_count = ntohs (msg->relay_count);
+    uint32_t relay_count = ntohl (msg->relay_count);
     uint16_t relay_size = relay_count * sizeof (*relays);
     struct GNUNET_MessageHeader *join_msg = NULL;
     uint16_t join_msg_size = 0;
diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c
index 5cd729203..c8d82e892 100644
--- a/src/multicast/multicast_api.c
+++ b/src/multicast/multicast_api.c
@@ -802,6 +802,7 @@ GNUNET_MULTICAST_member_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
   join->group_key = *group_key;
   join->member_key = *member_key;
   join->origin = *origin;
+  join->relay_count = ntohl (relay_count);
   if (0 < relay_size)
     memcpy (&join[1], relays, relay_size);
   if (0 < join_msg_size)