- fix invalid free in token rest, fix build bug, move rest up in dependancy list

diff --git a/src/Makefile.am b/src/Makefile.am
index cdc016afbc8ed816cacc7b7eb5e12957a03eb0e5..5785242ba9767020116a28f54b821c4fb305d206 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,6 +57,7 @@ else
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
+       $(REST_DIR) \
   hello \
   tun \
   block \
@@ -99,7 +100,6 @@ SUBDIRS = \
   fs \
   exit \
   pt \
-  $(REST_DIR) \
   integration-tests \
   $(EXP_DIR)
 

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index f38aecd0dd20ea7e0d9cdad6db71abdc64ef7655..b058a8033717b9306e650e318ad39230c3605d53 100644 (file)
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -232,6 +232,7 @@ libgnunet_plugin_rest_gns_la_SOURCES = \
   plugin_rest_gns.c
 libgnunet_plugin_rest_gns_la_LIBADD = \
   libgnunetgns.la \
+       $(top_builddir)/src/rest/libgnunetrest.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
   $(LTLIBINTL) -ljansson -lmicrohttpd

diff --git a/src/identity-token/plugin_rest_identity_token.c b/src/identity-token/plugin_rest_identity_token.c
index 025bec39bf90df02b96b582c66a7c442ca02889a..f12069c32b6b80f9308f716be51aa4e22dfaf185 100644 (file)
--- 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,
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Ego not found: %s\n", ego_val);
         resp = GNUNET_REST_create_json_response (NULL);
         handle->proc (handle->proc_cls, resp, MHD_HTTP_BAD_REQUEST);
-        GNUNET_free (ego_val);
         cleanup_handle (handle);
         return;
       }
-      GNUNET_free (ego_val);
     }
   }
   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 ae90665e2080661a93e2894ddda7d077e42082e8..64fb36fb57c997c359730a9ba9d6283f1125432b 100644 (file)
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -66,6 +66,7 @@ libgnunet_plugin_rest_identity_la_SOURCES = \
   plugin_rest_identity.c
 libgnunet_plugin_rest_identity_la_LIBADD = \
        libgnunetidentity.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
   $(LTLIBINTL) -ljansson -lmicrohttpd
 libgnunet_plugin_rest_identity_la_LDFLAGS = \

diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 87b05862c3c2db006ab10c09ff470c7751c193e4..62d433a11f7d77b668c948c538f63af7b0c2e9f4 100644 (file)
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -189,6 +189,7 @@ libgnunet_plugin_rest_namestore_la_SOURCES = \
   plugin_rest_namestore.c
 libgnunet_plugin_rest_namestore_la_LIBADD = \
   libgnunetnamestore.la \
+       $(top_builddir)/src/rest/libgnunetrest.la \
        $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
   $(LTLIBINTL) -ljansson -lmicrohttpd