diff options
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/gns/Makefile.am | 1 | ||||
-rw-r--r-- | src/identity-token/plugin_rest_identity_token.c | 2 | ||||
-rw-r--r-- | src/identity/Makefile.am | 1 | ||||
-rw-r--r-- | src/namestore/Makefile.am | 1 |
5 files changed, 4 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index cdc016afb..5785242ba 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -57,6 +57,7 @@ else | |||
57 | SUBDIRS = \ | 57 | SUBDIRS = \ |
58 | include $(INTLEMU_SUBDIRS) \ | 58 | include $(INTLEMU_SUBDIRS) \ |
59 | util \ | 59 | util \ |
60 | $(REST_DIR) \ | ||
60 | hello \ | 61 | hello \ |
61 | tun \ | 62 | tun \ |
62 | block \ | 63 | block \ |
@@ -99,7 +100,6 @@ SUBDIRS = \ | |||
99 | fs \ | 100 | fs \ |
100 | exit \ | 101 | exit \ |
101 | pt \ | 102 | pt \ |
102 | $(REST_DIR) \ | ||
103 | integration-tests \ | 103 | integration-tests \ |
104 | $(EXP_DIR) | 104 | $(EXP_DIR) |
105 | 105 | ||
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index f38aecd0d..b058a8033 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -232,6 +232,7 @@ libgnunet_plugin_rest_gns_la_SOURCES = \ | |||
232 | plugin_rest_gns.c | 232 | plugin_rest_gns.c |
233 | libgnunet_plugin_rest_gns_la_LIBADD = \ | 233 | libgnunet_plugin_rest_gns_la_LIBADD = \ |
234 | libgnunetgns.la \ | 234 | libgnunetgns.la \ |
235 | $(top_builddir)/src/rest/libgnunetrest.la \ | ||
235 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 236 | $(top_builddir)/src/identity/libgnunetidentity.la \ |
236 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | 237 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ |
237 | $(LTLIBINTL) -ljansson -lmicrohttpd | 238 | $(LTLIBINTL) -ljansson -lmicrohttpd |
diff --git a/src/identity-token/plugin_rest_identity_token.c b/src/identity-token/plugin_rest_identity_token.c index 025bec39b..f12069c32 100644 --- a/src/identity-token/plugin_rest_identity_token.c +++ b/src/identity-token/plugin_rest_identity_token.c | |||
@@ -553,11 +553,9 @@ issue_token_cont (struct RestConnectionDataHandle *con, | |||
553 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Ego not found: %s\n", ego_val); | 553 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Ego not found: %s\n", ego_val); |
554 | resp = GNUNET_REST_create_json_response (NULL); | 554 | resp = GNUNET_REST_create_json_response (NULL); |
555 | handle->proc (handle->proc_cls, resp, MHD_HTTP_BAD_REQUEST); | 555 | handle->proc (handle->proc_cls, resp, MHD_HTTP_BAD_REQUEST); |
556 | GNUNET_free (ego_val); | ||
557 | cleanup_handle (handle); | 556 | cleanup_handle (handle); |
558 | return; | 557 | return; |
559 | } | 558 | } |
560 | GNUNET_free (ego_val); | ||
561 | } | 559 | } |
562 | } | 560 | } |
563 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ego to issue token for: %s\n", egoname); | 561 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ego to issue token for: %s\n", egoname); |
diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am index ae90665e2..64fb36fb5 100644 --- a/src/identity/Makefile.am +++ b/src/identity/Makefile.am | |||
@@ -66,6 +66,7 @@ libgnunet_plugin_rest_identity_la_SOURCES = \ | |||
66 | plugin_rest_identity.c | 66 | plugin_rest_identity.c |
67 | libgnunet_plugin_rest_identity_la_LIBADD = \ | 67 | libgnunet_plugin_rest_identity_la_LIBADD = \ |
68 | libgnunetidentity.la \ | 68 | libgnunetidentity.la \ |
69 | $(top_builddir)/src/rest/libgnunetrest.la \ | ||
69 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | 70 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ |
70 | $(LTLIBINTL) -ljansson -lmicrohttpd | 71 | $(LTLIBINTL) -ljansson -lmicrohttpd |
71 | libgnunet_plugin_rest_identity_la_LDFLAGS = \ | 72 | libgnunet_plugin_rest_identity_la_LDFLAGS = \ |
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index 87b05862c..62d433a11 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am | |||
@@ -189,6 +189,7 @@ libgnunet_plugin_rest_namestore_la_SOURCES = \ | |||
189 | plugin_rest_namestore.c | 189 | plugin_rest_namestore.c |
190 | libgnunet_plugin_rest_namestore_la_LIBADD = \ | 190 | libgnunet_plugin_rest_namestore_la_LIBADD = \ |
191 | libgnunetnamestore.la \ | 191 | libgnunetnamestore.la \ |
192 | $(top_builddir)/src/rest/libgnunetrest.la \ | ||
192 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 193 | $(top_builddir)/src/identity/libgnunetidentity.la \ |
193 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | 194 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ |
194 | $(LTLIBINTL) -ljansson -lmicrohttpd | 195 | $(LTLIBINTL) -ljansson -lmicrohttpd |