More bugfixes to make gnunet-social usable

- the host's entry message is not ignored anymore
- guest-talk and host-anounce are working

2 files changed, 2 insertions, 2 deletions

diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c
index afd06028c..6d72ca552 100644
--- a/src/social/gnunet-social.c
+++ b/src/social/gnunet-social.c
@@ -360,7 +360,7 @@ notify_data (void *cls, uint16_t *data_size, void *data)
 
   if (0 == tmit->size)
   {
-    if (op_host_announce || op_host_assign || op_guest_talk)
+    if ((op_host_announce || op_host_assign || op_guest_talk) && !opt_follow)
     {
       exit_success ();
     }
diff --git a/src/social/social_api.c b/src/social/social_api.c
index d96c93d8f..82928a258 100644
--- a/src/social/social_api.c
+++ b/src/social/social_api.c
@@ -893,7 +893,7 @@ handle_guest_enter_decision (void *cls,
   struct GNUNET_SOCIAL_Guest *gst = cls;
 
   struct GNUNET_PSYC_Message *pmsg = NULL;
-  if (ntohs (dcsn->header.size) <= sizeof (*dcsn) + sizeof (*pmsg))
+  if (ntohs (dcsn->header.size) > sizeof (*dcsn))
     pmsg = (struct GNUNET_PSYC_Message *) GNUNET_MQ_extract_nested_mh (dcsn);
 
   if (NULL != gst->entry_dcsn_cb)