[taler-anastasis] branch master updated: fix /privacy handler

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new 52ed1d5  fix /privacy handler
52ed1d5 is described below

commit 52ed1d5a57647aab1285ac7e2a191936645a69b4
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Sep 29 18:04:24 2021 +0200

    fix /privacy handler
---
 src/backend/anastasis-httpd.c       |  2 +-
 src/backend/anastasis-httpd_terms.c | 21 +--------------------
 src/backend/anastasis-httpd_terms.h |  2 +-
 src/backend/anastasis.conf          |  4 ++--
 4 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/backend/anastasis-httpd.c b/src/backend/anastasis-httpd.c
index 9f5c87b..76f1d3e 100644
--- a/src/backend/anastasis-httpd.c
+++ b/src/backend/anastasis-httpd.c
@@ -295,7 +295,7 @@ url_handler (void *cls,
       &TMH_MHD_handler_agpl_redirect, MHD_HTTP_FOUND },
     { "/terms", MHD_HTTP_METHOD_GET, NULL,
       NULL, 0,
-      &AH_handler_terms, MHD_HTTP_OK },
+      &AH_handler_privacy, MHD_HTTP_OK },
     { "/privacy", MHD_HTTP_METHOD_GET, NULL,
       NULL, 0,
       &AH_handler_terms, MHD_HTTP_OK },
diff --git a/src/backend/anastasis-httpd_terms.c 
b/src/backend/anastasis-httpd_terms.c
index b4debe7..55a28e1 100644
--- a/src/backend/anastasis-httpd_terms.c
+++ b/src/backend/anastasis-httpd_terms.c
@@ -36,13 +36,6 @@ static struct TALER_MHD_Legal *tos;
 static struct TALER_MHD_Legal *pp;
 
 
-/**
- * Manages a /terms call.
- *
- * @param rh context of the handler
- * @param connection the MHD connection to handle
- * @return MHD result code
- */
 MHD_RESULT
 AH_handler_terms (struct AH_RequestHandler *rh,
                   struct MHD_Connection *connection)
@@ -53,15 +46,8 @@ AH_handler_terms (struct AH_RequestHandler *rh,
 }
 
 
-/**
- * Handle a "/privacy" request.
- *
- * @param rh context of the handler
- * @param connection the MHD connection to handle
- * @return MHD result code
- */
 MHD_RESULT
-AH_handler_privacy (const struct AH_RequestHandler *rh,
+AH_handler_privacy (struct AH_RequestHandler *rh,
                     struct MHD_Connection *connection)
 {
   (void) rh;
@@ -70,11 +56,6 @@ AH_handler_privacy (const struct AH_RequestHandler *rh,
 }
 
 
-/**
- * Load our terms of service as per configuration.
- *
- * @param cfg configuration to process
- */
 void
 AH_load_terms (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
diff --git a/src/backend/anastasis-httpd_terms.h 
b/src/backend/anastasis-httpd_terms.h
index e34c86e..5043c57 100644
--- a/src/backend/anastasis-httpd_terms.h
+++ b/src/backend/anastasis-httpd_terms.h
@@ -45,7 +45,7 @@ AH_handler_terms (struct AH_RequestHandler *rh,
  * @return MHD result code
  */
 MHD_RESULT
-AH_handler_privacy (const struct AH_RequestHandler *rh,
+AH_handler_privacy (struct AH_RequestHandler *rh,
                     struct MHD_Connection *connection);
 
 /**
diff --git a/src/backend/anastasis.conf b/src/backend/anastasis.conf
index 8d2f0f6..ad85be2 100644
--- a/src/backend/anastasis.conf
+++ b/src/backend/anastasis.conf
@@ -53,14 +53,14 @@ FULFILLMENT_URL = taler://fulfillment-success
 
 
 # Directory with our terms of service.
-TERMS_DIR = $DATADIR/tos/
+TERMS_DIR = ${DATADIR}tos/
 
 # Etag / filename for the terms of service.
 TERMS_ETAG = 0
 
 
 # Directory with our privacy policy.
-PRIVACY_DIR = $DATADIR/pp/
+PRIVACY_DIR = ${DATADIR}pp/
 
 # Etag / filename for the privacy policy.
 PRIVACY_ETAG = 0

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.