From: Martin Schanzenbach <mschanzenbach@posteo.de>
Date: Mon, 14 Sep 2015 16:05:31 +0000 (+0000)
Subject: - fix invalid free in token rest, fix build bug, move rest up in dependancy list
X-Git-Tag: initial-import-from-subversion-38251~1400
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=171cfeb1b32e21d12a1dbcbc5a9099bab37fab7e;p=oweals%2Fgnunet.git

- 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 cdc016afb..5785242ba 100644
--- 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 f38aecd0d..b058a8033 100644
--- 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 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,
         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 ae90665e2..64fb36fb5 100644
--- 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 87b05862c..62d433a11 100644
--- 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