-actually, require proxy option to be empty, cleaner

1 files changed, 13 insertions, 16 deletions

diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c b/src/hostlist/gnunet-daemon-hostlist_client.c
index cb1235915..b92f195f8 100644
--- a/src/hostlist/gnunet-daemon-hostlist_client.c
+++ b/src/hostlist/gnunet-daemon-hostlist_client.c
@@ -970,7 +970,7 @@ download_hostlist ()
   GNUNET_STATISTICS_update (stats,
                             gettext_noop ("# hostlist downloads initiated"), 1,
                             GNUNET_NO);
-  if (proxy != NULL)
+  if (NULL != proxy)
   {
     CURL_EASY_SETOPT (curl, CURLOPT_PROXY, proxy);
     CURL_EASY_SETOPT (curl, CURLOPT_PROXYTYPE, proxy_type);
@@ -1577,21 +1577,18 @@ GNUNET_HOSTLIST_client_start (const struct GNUNET_CONFIGURATION_Handle *c,
         proxy_type = CURLPROXY_SOCKS5_HOSTNAME;
       else
       {
-        if (0 != strcasecmp (proxytype_str, "NONE"))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                      _("Invalid proxy type: `%s', disabling proxy! Check configuration!\n"),
-                      proxytype_str);
-          GNUNET_free (proxytype_str);
-          GNUNET_free (proxy);
-          proxy = NULL;
-          GNUNET_free_non_null (proxy_username);
-          proxy_username = NULL;
-          GNUNET_free_non_null (proxy_password);
-          proxy_password = NULL;
-
-          return GNUNET_SYSERR;
-        }
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    _("Invalid proxy type: `%s', disabling proxy! Check configuration!\n"),
+                    proxytype_str);
+        GNUNET_free (proxytype_str);
+        GNUNET_free (proxy);
+        proxy = NULL;
+        GNUNET_free_non_null (proxy_username);
+        proxy_username = NULL;
+        GNUNET_free_non_null (proxy_password);
+        proxy_password = NULL;
+
+        return GNUNET_SYSERR;
       }
     }
     GNUNET_free_non_null (proxytype_str);