diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-07-14 23:07:50 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-07-14 23:07:50 +0000 |
commit | 0fee351877c8b33fa2c029817f0e7780ed9e221a (patch) | |
tree | afd12ed282e285301d43172fac87fdcdf36118b3 /src/gns | |
parent | 3b6b8d33bb3eb760cdf08b268eb7ad1f3b0da00c (diff) | |
download | gnunet-0fee351877c8b33fa2c029817f0e7780ed9e221a.tar.gz gnunet-0fee351877c8b33fa2c029817f0e7780ed9e221a.zip |
-fix
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/Makefile.am | 16 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index f72a5dc43..c91b26ceb 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -60,7 +60,8 @@ check_PROGRAMS = \ | |||
60 | test_gns_dht_threepeer \ | 60 | test_gns_dht_threepeer \ |
61 | test_gns_cname_lookup \ | 61 | test_gns_cname_lookup \ |
62 | test_gns_ns_lookup \ | 62 | test_gns_ns_lookup \ |
63 | test_gns_revocation | 63 | test_gns_revocation \ |
64 | test_gns_proxy | ||
64 | 65 | ||
65 | 66 | ||
66 | # test_gns_simple_lookup | 67 | # test_gns_simple_lookup |
@@ -71,6 +72,19 @@ check_PROGRAMS = \ | |||
71 | plugin_LTLIBRARIES = \ | 72 | plugin_LTLIBRARIES = \ |
72 | libgnunet_plugin_block_gns.la | 73 | libgnunet_plugin_block_gns.la |
73 | 74 | ||
75 | test_gns_proxy_SOURCES = \ | ||
76 | test_gns_proxy.c | ||
77 | test_gns_proxy_LDADD = -lmicrohttpd @LIBCURL@ \ | ||
78 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
79 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | ||
80 | $(top_builddir)/src/gns/libgnunetgns.la \ | ||
81 | $(top_builddir)/src/testing/libgnunettesting.la | ||
82 | test_gns_proxy_DEPENDENCIES = \ | ||
83 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
84 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | ||
85 | $(top_builddir)/src/gns/libgnunetgns.la \ | ||
86 | $(top_builddir)/src/testing/libgnunettesting.la | ||
87 | |||
74 | test_gns_dht_threepeer_SOURCES = \ | 88 | test_gns_dht_threepeer_SOURCES = \ |
75 | test_gns_dht_threepeer.c | 89 | test_gns_dht_threepeer.c |
76 | test_gns_dht_threepeer_LDADD = \ | 90 | test_gns_dht_threepeer_LDADD = \ |
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 03d08cd6b..1897c4f0b 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -3121,6 +3121,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
3121 | } | 3121 | } |
3122 | cafile = cafile_cfg; | 3122 | cafile = cafile_cfg; |
3123 | } | 3123 | } |
3124 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
3125 | "Using %s as CA\n", cafile); | ||
3124 | 3126 | ||
3125 | gnutls_global_init (); | 3127 | gnutls_global_init (); |
3126 | gnutls_x509_crt_init (&proxy_ca.cert); | 3128 | gnutls_x509_crt_init (&proxy_ca.cert); |