Merge remote-tracking branch 'origin/master' into credentials

1 files changed, 8 insertions, 7 deletions

diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index 87b30c04a..d9a5dd684 100644
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -3852,7 +3852,8 @@ run (void *cls,
 
   /* Cadet handle acquired, now open ports and announce regular
      expressions matching our exit */
-  if ( (GNUNET_YES == ipv4_enabled) && (GNUNET_YES == ipv4_exit) )
+  if ( (GNUNET_YES == ipv4_enabled) &&
+       (GNUNET_YES == ipv4_exit) )
   {
     GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_IPV4_GATEWAY,
                         strlen (GNUNET_APPLICATION_PORT_IPV4_GATEWAY),
@@ -3931,12 +3932,12 @@ run (void *cls,
       GNUNET_free (prefixed_regex);
     }
   }
-  if ((ipv4_exit) || (ipv6_exit))
-    helper_handle = GNUNET_HELPER_start (GNUNET_NO,
-                                         "gnunet-helper-exit",
-                                         exit_argv,
-                                         &message_token,
-                                         NULL, NULL);
+  helper_handle = GNUNET_HELPER_start (GNUNET_NO,
+                                       "gnunet-helper-exit",
+                                       exit_argv,
+                                       &message_token,
+                                       NULL,
+                                       NULL);
 }