fix -c option

diff --git a/src/gns/gnunet-gns-proxy-setup-ca.in b/src/gns/gnunet-gns-proxy-setup-ca.in
index 59dc69da9b02502164de64ed917833a24f7c24e5..184da48530875eedd10d391a74dec033dc64adf8 100644 (file)
--- a/src/gns/gnunet-gns-proxy-setup-ca.in
+++ b/src/gns/gnunet-gns-proxy-setup-ca.in
@@ -141,7 +141,7 @@ generate_ca()
         rm -f $GNSCAKY $GNSCANO $GNSCERT
         exit 1
     fi
-    if [ -n "${GNUNET_CONFIG}" ]; then
+    if [ -n "${GNUNET_CONFIG_FILE}" ]; then
         GNUNET_CONFIG="-c ${GNUNET_CONFIG_FILE}"
     else
         GNUNET_CONFIG=""
@@ -231,6 +231,7 @@ main()
             c)
                 options="$options -c $OPTARG"
                 infomsg "Using configuration file $OPTARG"
+                GNUNET_CONFIG_FILE=${OPTARG}
                 ;;
             \?)
                 echo "Invalid option: -$OPTARG" >&2

diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c
index 0bfd84c910d1e0c3b494d408192672f93da5997b..2a7f8104bbc1940207adbb5933a35b72aa3dac52 100644 (file)
--- a/src/gns/test_gns_proxy.c
+++ b/src/gns/test_gns_proxy.c
@@ -370,7 +370,9 @@ start_curl (void *cls)
   multi = curl_multi_init ();
   GNUNET_assert (multi != NULL);
   GNUNET_assert (CURLM_OK == curl_multi_add_handle (multi, curl));
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Beginning HTTP download from `%s'\n", url);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Beginning HTTP download from `%s'\n",
+              url);
   curl_main ();
 }
 

diff --git a/src/gns/test_proxy.sh b/src/gns/test_proxy.sh
index 5ea08312291a40204528b60330d75479fb6fa0ff..7c17cd4c5da9fffe78141e9336515baecc0f21d8 100755 (executable)
--- a/src/gns/test_proxy.sh
+++ b/src/gns/test_proxy.sh
@@ -2,6 +2,8 @@
 # This file is in the public domain.
 TEST_DOMAIN="www.test"
 
+# Delete old files before starting test
+rm -rf /tmp/gnunet/test-gnunet-gns-testing/
 gnunet-arm -s -c test_gns_proxy.conf
 gnunet-gns-proxy-setup-ca -c test_gns_proxy.conf