1 files changed, 8 insertions, 12 deletions

diff --git a/src/messenger/gnunet-service-messenger.c b/src/messenger/gnunet-service-messenger.c
index 974bdbd37..e948ffee2 100644
--- a/src/messenger/gnunet-service-messenger.c
+++ b/src/messenger/gnunet-service-messenger.c
@@ -212,21 +212,17 @@ check_send_message (void *cls,
 
   const uint16_t length = full_length - sizeof(*msg);
   const char *buffer = ((const char*) msg) + sizeof(*msg);
-
-  size_t key_length = 0;
-
-  if (! (flags & GNUNET_MESSENGER_FLAG_PRIVATE))
-    goto check_for_message;
-
   struct GNUNET_IDENTITY_PublicKey public_key;
 
-  if (GNUNET_SYSERR ==
-      GNUNET_IDENTITY_read_public_key_from_buffer (buffer, length,
-                                                   &public_key,
-                                                   &key_length))
-    return GNUNET_NO;
 
-  check_for_message:
+  size_t key_length = 0;
+
+  if ((flags & GNUNET_MESSENGER_FLAG_PRIVATE))
+    if (GNUNET_SYSERR ==
+        GNUNET_IDENTITY_read_public_key_from_buffer (buffer, length,
+                                                     &public_key,
+                                                     &key_length))
+      return GNUNET_NO;
 
   const uint16_t msg_length = length - key_length;
   const char*msg_buffer = buffer + key_length;