[GNUnet-SVN] r36361 - in gnunet/src: . gns identity identity-token namestore

[gnunet]

Author: schanzen
Date: 2015-09-14 18:05:31 +0200 (Mon, 14 Sep 2015)
New Revision: 36361

Modified:
   gnunet/src/Makefile.am
   gnunet/src/gns/Makefile.am
   gnunet/src/identity-token/plugin_rest_identity_token.c
   gnunet/src/identity/Makefile.am
   gnunet/src/namestore/Makefile.am
Log:
- fix invalid free in token rest, fix build bug, move rest up in dependancy list


Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2015-09-14 15:08:54 UTC (rev 36360)
+++ gnunet/src/Makefile.am      2015-09-14 16:05:31 UTC (rev 36361)
@@ -57,6 +57,7 @@
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
+       $(REST_DIR) \
   hello \
   tun \
   block \
@@ -99,7 +100,6 @@
   fs \
   exit \
   pt \
-  $(REST_DIR) \
   integration-tests \
   $(EXP_DIR)
 

Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am  2015-09-14 15:08:54 UTC (rev 36360)
+++ gnunet/src/gns/Makefile.am  2015-09-14 16:05:31 UTC (rev 36361)
@@ -232,6 +232,7 @@
   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

Modified: gnunet/src/identity/Makefile.am
===================================================================
--- gnunet/src/identity/Makefile.am     2015-09-14 15:08:54 UTC (rev 36360)
+++ gnunet/src/identity/Makefile.am     2015-09-14 16:05:31 UTC (rev 36361)
@@ -66,6 +66,7 @@
   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 = \

Modified: gnunet/src/identity-token/plugin_rest_identity_token.c
===================================================================
--- gnunet/src/identity-token/plugin_rest_identity_token.c      2015-09-14 
15:08:54 UTC (rev 36360)
+++ gnunet/src/identity-token/plugin_rest_identity_token.c      2015-09-14 
16:05:31 UTC (rev 36361)
@@ -553,11 +553,9 @@
         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);

Modified: gnunet/src/namestore/Makefile.am
===================================================================
--- gnunet/src/namestore/Makefile.am    2015-09-14 15:08:54 UTC (rev 36360)
+++ gnunet/src/namestore/Makefile.am    2015-09-14 16:05:31 UTC (rev 36361)
@@ -189,6 +189,7 @@
   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