From: Nathan S. Evans <evans@in.tum.de>
Date: Wed, 26 Jan 2011 10:31:48 +0000 (+0000)
Subject: hack so that configuration can force non-unixpath connections
X-Git-Tag: initial-import-from-subversion-38251~19242
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=68de77cea9e40330ba0825f9206d34acc47c12e0;p=oweals%2Fgnunet.git

hack so that configuration can force non-unixpath connections
---

diff --git a/src/util/client.c b/src/util/client.c
index ed554d96c..257a69b5a 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -276,10 +276,11 @@ do_connect (const char *service_name,
   if (0 == (attempt % 2))
     {
       /* on even rounds, try UNIX */
-      if (GNUNET_OK ==
+      if ((GNUNET_OK ==
 	  GNUNET_CONFIGURATION_get_value_string (cfg,
 						 service_name,
-						 "UNIXPATH", &unixpath))
+						 "UNIXPATH", &unixpath)) &&
+          (0 < strlen (unixpath)))
 	{
 	  sock = GNUNET_CONNECTION_create_from_connect_to_unixpath (cfg,
 								    unixpath);
@@ -321,10 +322,11 @@ do_connect (const char *service_name,
       if (0 != (attempt % 2))
 	{
 	  /* try UNIX */
-	  if (GNUNET_OK ==
+	  if ((GNUNET_OK ==
 	      GNUNET_CONFIGURATION_get_value_string (cfg,
 						     service_name,
-						     "UNIXPATH", &unixpath))
+						     "UNIXPATH", &unixpath)) &&
+              (0 < strlen (unixpath)))
 	    {
 	      sock = GNUNET_CONNECTION_create_from_connect_to_unixpath (cfg,
 									unixpath);