diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gns/Makefile.am | 1 | ||||
-rw-r--r-- | src/gns/gnunet-bcd.c | 22 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 9f03311e1..b35836233 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -156,6 +156,7 @@ gnunet_bcd_SOURCES = \ | |||
156 | gnunet-bcd.c | 156 | gnunet-bcd.c |
157 | gnunet_bcd_LDADD = \ | 157 | gnunet_bcd_LDADD = \ |
158 | $(top_builddir)/src/util/libgnunetutil.la \ | 158 | $(top_builddir)/src/util/libgnunetutil.la \ |
159 | $(top_builddir)/src/identity/libgnunetidentity.la \ | ||
159 | $(GN_LIBINTL) $(MHD_LIBS) | 160 | $(GN_LIBINTL) $(MHD_LIBS) |
160 | gnunet_bcd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | 161 | gnunet_bcd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) |
161 | 162 | ||
diff --git a/src/gns/gnunet-bcd.c b/src/gns/gnunet-bcd.c index f71f477ef..a2e94089c 100644 --- a/src/gns/gnunet-bcd.c +++ b/src/gns/gnunet-bcd.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include <microhttpd.h> | 28 | #include <microhttpd.h> |
29 | #include "gnunet_util_lib.h" | 29 | #include "gnunet_util_lib.h" |
30 | #include "gnunet_identity_service.h" | ||
30 | #include "gnunet_mhd_compat.h" | 31 | #include "gnunet_mhd_compat.h" |
31 | 32 | ||
32 | /** | 33 | /** |
@@ -148,7 +149,7 @@ access_handler_callback (void *cls, | |||
148 | char *p; | 149 | char *p; |
149 | char *tmp; | 150 | char *tmp; |
150 | char *deffile; | 151 | char *deffile; |
151 | struct GNUNET_CRYPTO_EcdsaPublicKey pub; | 152 | struct GNUNET_IDENTITY_PublicKey pub; |
152 | size_t slen; | 153 | size_t slen; |
153 | FILE *f; | 154 | FILE *f; |
154 | struct stat st; | 155 | struct stat st; |
@@ -166,9 +167,8 @@ access_handler_callback (void *cls, | |||
166 | MHD_lookup_connection_value (connection, MHD_GET_ARGUMENT_KIND, "gnskey"); | 167 | MHD_lookup_connection_value (connection, MHD_GET_ARGUMENT_KIND, "gnskey"); |
167 | if ((NULL == gnskey) || | 168 | if ((NULL == gnskey) || |
168 | (GNUNET_OK != | 169 | (GNUNET_OK != |
169 | GNUNET_CRYPTO_ecdsa_public_key_from_string (gnskey, | 170 | GNUNET_IDENTITY_public_key_from_string (gnskey, |
170 | strlen (gnskey), | 171 | &pub))) |
171 | &pub))) | ||
172 | { | 172 | { |
173 | return MHD_queue_response (connection, | 173 | return MHD_queue_response (connection, |
174 | MHD_HTTP_OK, | 174 | MHD_HTTP_OK, |
@@ -218,10 +218,10 @@ access_handler_callback (void *cls, | |||
218 | (NULL == gns_nick) ? "" : gns_nick); | 218 | (NULL == gns_nick) ? "" : gns_nick); |
219 | fclose (f); | 219 | fclose (f); |
220 | GNUNET_asprintf ( | 220 | GNUNET_asprintf ( |
221 | &p, | 221 | &p, |
222 | "cd %s; cp %s gns-bcd.tex | pdflatex --enable-write18 gns-bcd.tex > /dev/null 2> /dev/null", | 222 | "cd %s; cp %s gns-bcd.tex | pdflatex --enable-write18 gns-bcd.tex > /dev/null 2> /dev/null", |
223 | tmp, | 223 | tmp, |
224 | resfile); | 224 | resfile); |
225 | GNUNET_free (deffile); | 225 | GNUNET_free (deffile); |
226 | ret = system (p); | 226 | ret = system (p); |
227 | if (WIFSIGNALED (ret) || (0 != WEXITSTATUS (ret))) | 227 | if (WIFSIGNALED (ret) || (0 != WEXITSTATUS (ret))) |
@@ -506,7 +506,7 @@ main (int argc, char *const *argv) | |||
506 | "port", | 506 | "port", |
507 | "PORT", | 507 | "PORT", |
508 | gettext_noop ( | 508 | gettext_noop ( |
509 | "Run HTTP serve on port PORT (default is 8888)"), | 509 | "Run HTTP serve on port PORT (default is 8888)"), |
510 | &port), | 510 | &port), |
511 | GNUNET_GETOPT_OPTION_END | 511 | GNUNET_GETOPT_OPTION_END |
512 | }; | 512 | }; |
@@ -523,8 +523,8 @@ main (int argc, char *const *argv) | |||
523 | options, | 523 | options, |
524 | &run, | 524 | &run, |
525 | NULL)) | 525 | NULL)) |
526 | ? 0 | 526 | ? 0 |
527 | : 1; | 527 | : 1; |
528 | GNUNET_free_nz ((void *) argv); | 528 | GNUNET_free_nz ((void *) argv); |
529 | return ret; | 529 | return ret; |
530 | } | 530 | } |