diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2023-10-24 21:28:49 +0200 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2023-10-24 21:28:49 +0200 |
commit | baf5b12e7b6e5918895a71ace1c5217cb0f21637 (patch) | |
tree | e304b86e9466e6afbd4a3b965d135a7010688958 | |
parent | d4ef38c17c70d7c60a7900613fde168053859462 (diff) | |
download | gnunet-baf5b12e7b6e5918895a71ace1c5217cb0f21637.tar.gz gnunet-baf5b12e7b6e5918895a71ace1c5217cb0f21637.zip |
REST: Fix compilation without jose
-rw-r--r-- | src/service/rest/gnunet-rest-server.c | 8 | ||||
-rw-r--r-- | src/service/rest/meson.build | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/service/rest/gnunet-rest-server.c b/src/service/rest/gnunet-rest-server.c index ce81704ae..7cc4025b0 100644 --- a/src/service/rest/gnunet-rest-server.c +++ b/src/service/rest/gnunet-rest-server.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include "identity_plugin.h" | 34 | #include "identity_plugin.h" |
35 | #include "namestore_plugin.h" | 35 | #include "namestore_plugin.h" |
36 | #include "gns_plugin.h" | 36 | #include "gns_plugin.h" |
37 | #ifdef HAVE_JOSE | 37 | #if HAVE_JOSE |
38 | #include "openid_plugin.h" | 38 | #include "openid_plugin.h" |
39 | #endif | 39 | #endif |
40 | #include "reclaim_plugin.h" | 40 | #include "reclaim_plugin.h" |
@@ -265,7 +265,7 @@ struct GNUNET_REST_Plugin *copying_plugin; | |||
265 | struct GNUNET_REST_Plugin *identity_plugin; | 265 | struct GNUNET_REST_Plugin *identity_plugin; |
266 | struct GNUNET_REST_Plugin *namestore_plugin; | 266 | struct GNUNET_REST_Plugin *namestore_plugin; |
267 | struct GNUNET_REST_Plugin *gns_plugin; | 267 | struct GNUNET_REST_Plugin *gns_plugin; |
268 | #ifdef HAVE_JOSE | 268 | #if HAVE_JOSE |
269 | struct GNUNET_REST_Plugin *openid_plugin; | 269 | struct GNUNET_REST_Plugin *openid_plugin; |
270 | #endif | 270 | #endif |
271 | struct GNUNET_REST_Plugin *reclaim_plugin; | 271 | struct GNUNET_REST_Plugin *reclaim_plugin; |
@@ -1020,7 +1020,7 @@ do_shutdown (void *cls) | |||
1020 | REST_copying_done (copying_plugin); | 1020 | REST_copying_done (copying_plugin); |
1021 | REST_identity_done (identity_plugin); | 1021 | REST_identity_done (identity_plugin); |
1022 | REST_gns_done (gns_plugin); | 1022 | REST_gns_done (gns_plugin); |
1023 | #ifdef HAVE_JOSE | 1023 | #if HAVE_JOSE |
1024 | REST_openid_done (openid_plugin); | 1024 | REST_openid_done (openid_plugin); |
1025 | #endif | 1025 | #endif |
1026 | REST_reclaim_done (reclaim_plugin); | 1026 | REST_reclaim_done (reclaim_plugin); |
@@ -1403,7 +1403,7 @@ run (void *cls, | |||
1403 | { | 1403 | { |
1404 | GNUNET_SCHEDULER_shutdown (); | 1404 | GNUNET_SCHEDULER_shutdown (); |
1405 | } | 1405 | } |
1406 | #ifdef HAVE_JOSE | 1406 | #if HAVE_JOSE |
1407 | struct GNUNET_REST_Plugin *openid_plugin = REST_openid_init (cfg); | 1407 | struct GNUNET_REST_Plugin *openid_plugin = REST_openid_init (cfg); |
1408 | if (GNUNET_OK != setup_plugin (openid_plugin->name, &REST_openid_process_request, openid_plugin)) | 1408 | if (GNUNET_OK != setup_plugin (openid_plugin->name, &REST_openid_process_request, openid_plugin)) |
1409 | { | 1409 | { |
diff --git a/src/service/rest/meson.build b/src/service/rest/meson.build index 347cbb852..1ccb89796 100644 --- a/src/service/rest/meson.build +++ b/src/service/rest/meson.build | |||
@@ -6,12 +6,14 @@ gnunetservicerest_src = ['gnunet-rest-server.c', | |||
6 | 'identity_plugin.c', | 6 | 'identity_plugin.c', |
7 | 'namestore_plugin.c', | 7 | 'namestore_plugin.c', |
8 | 'gns_plugin.c', | 8 | 'gns_plugin.c', |
9 | 'openid_plugin.c', | ||
10 | 'oidc_helper.c', | ||
11 | 'json_reclaim.c', | 9 | 'json_reclaim.c', |
12 | 'reclaim_plugin.c', | 10 | 'reclaim_plugin.c', |
13 | ] | 11 | ] |
14 | 12 | ||
13 | if jose_dep.found() | ||
14 | gnunetservicerest_src += ['oidc_helper.c', 'openid_plugin.c'] | ||
15 | endif | ||
16 | |||
15 | configure_file(input : 'rest.conf', | 17 | configure_file(input : 'rest.conf', |
16 | output : 'rest.conf', | 18 | output : 'rest.conf', |
17 | configuration : cdata, | 19 | configuration : cdata, |