diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-12-24 19:34:53 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-12-24 19:34:53 +0000 |
commit | f1d741415d9af284955122c931118f2bca5ba2d0 (patch) | |
tree | 23b70808091aa1abaee37614b18647742b4de5c1 /src/revocation | |
parent | d26b19c91736433a783ce22b2d95ed490b6d9ca6 (diff) | |
download | gnunet-f1d741415d9af284955122c931118f2bca5ba2d0.tar.gz gnunet-f1d741415d9af284955122c931118f2bca5ba2d0.zip |
-make sure to link against right libgcrypt, enable abort of gnunet-revocation even if identity service is not running
Diffstat (limited to 'src/revocation')
-rw-r--r-- | src/revocation/Makefile.am | 3 | ||||
-rw-r--r-- | src/revocation/gnunet-revocation.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am index 25a171001..18d379b0b 100644 --- a/src/revocation/Makefile.am +++ b/src/revocation/Makefile.am | |||
@@ -34,6 +34,7 @@ libgnunetrevocation_la_SOURCES = \ | |||
34 | revocation_api.c revocation.h | 34 | revocation_api.c revocation.h |
35 | libgnunetrevocation_la_LIBADD = \ | 35 | libgnunetrevocation_la_LIBADD = \ |
36 | $(top_builddir)/src/util/libgnunetutil.la \ | 36 | $(top_builddir)/src/util/libgnunetutil.la \ |
37 | $(LIBGCRYPT_LIBS) \ | ||
37 | $(GN_LIBINTL) $(XLIB) -lgcrypt | 38 | $(GN_LIBINTL) $(XLIB) -lgcrypt |
38 | libgnunetrevocation_la_LDFLAGS = \ | 39 | libgnunetrevocation_la_LDFLAGS = \ |
39 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 40 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
@@ -66,7 +67,7 @@ test_revocation_LDADD = \ | |||
66 | $(top_builddir)/src/testbed/libgnunettestbed.la | 67 | $(top_builddir)/src/testbed/libgnunettestbed.la |
67 | 68 | ||
68 | check_PROGRAMS = \ | 69 | check_PROGRAMS = \ |
69 | test_revocation | 70 | test_revocation |
70 | 71 | ||
71 | 72 | ||
72 | check_SCRIPTS = \ | 73 | check_SCRIPTS = \ |
diff --git a/src/revocation/gnunet-revocation.c b/src/revocation/gnunet-revocation.c index 59f47ab97..5bb7965bf 100644 --- a/src/revocation/gnunet-revocation.c +++ b/src/revocation/gnunet-revocation.c | |||
@@ -90,6 +90,11 @@ static void | |||
90 | do_shutdown (void *cls, | 90 | do_shutdown (void *cls, |
91 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 91 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
92 | { | 92 | { |
93 | if (NULL != el) | ||
94 | { | ||
95 | GNUNET_IDENTITY_ego_lookup_cancel (el); | ||
96 | el = NULL; | ||
97 | } | ||
93 | if (NULL != q) | 98 | if (NULL != q) |
94 | { | 99 | { |
95 | GNUNET_REVOCATION_query_cancel (q); | 100 | GNUNET_REVOCATION_query_cancel (q); |