From de58cf01e32276f7123533c76f8646b7a7776934 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 7 Jun 2014 23:33:46 +0000
Subject: -fix error handling logic

---
 src/namestore/plugin_gtk_namestore_tlsa.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/namestore/plugin_gtk_namestore_tlsa.c')

diff --git a/src/namestore/plugin_gtk_namestore_tlsa.c b/src/namestore/plugin_gtk_namestore_tlsa.c
index d8dc60cd..191c785e 100644
--- a/src/namestore/plugin_gtk_namestore_tlsa.c
+++ b/src/namestore/plugin_gtk_namestore_tlsa.c
@@ -820,12 +820,14 @@ import_address_cb (void *cls,
                 _("Failed to connect to target address `%s': %s\n"),
                 GNUNET_a2s (addr, addrlen),
                 STRERROR (errno));
-    goto cleanup;
+    GNUNET_NETWORK_socket_close (ic->sock);
+    return;
   }
 
   GNUNET_RESOLVER_request_cancel (ic->rh);
 
   /* Use default priorities */
+  gnutls_certificate_allocate_credentials (&xcred);
   if (GNUTLS_E_SUCCESS !=
       (ret = gnutls_priority_set_direct (ic->session,
                                          "PERFORMANCE",
@@ -837,7 +839,6 @@ import_address_cb (void *cls,
     goto cleanup;
   }
   /* put the x509 credentials to the current session */
-  gnutls_certificate_allocate_credentials (&xcred);
   gnutls_credentials_set (ic->session,
                           GNUTLS_CRD_CERTIFICATE,
                           xcred);
-- 
cgit v1.2.3