[taler-merchant] branch master updated: fix #7105

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new e3e693d8 fix #7105
e3e693d8 is described below

commit e3e693d8ef3e04a0efd97ea4c2f5f640bc9b1826
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Nov 25 23:39:32 2021 +0100

    fix #7105
---
 src/backend/taler-merchant-httpd.c                | 1 +
 src/merchant-tools/taler-merchant-benchmark.c     | 3 ++-
 src/merchant-tools/taler-merchant-dbinit.c        | 1 +
 src/merchant-tools/taler-merchant-setup-reserve.c | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/backend/taler-merchant-httpd.c 
b/src/backend/taler-merchant-httpd.c
index 727a982e..e7f4dc2f 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -1844,6 +1844,7 @@ main (int argc,
                                  "TOKEN",
                                  "use TOKEN to initially authenticate access 
to the default instance (you can also set the TALER_MERCHANT_TOKEN environment 
variable instead)",
                                  &TMH_default_auth),
+    GNUNET_GETOPT_option_version (PACKAGE_VERSION "-" VCS_VERSION),
     GNUNET_GETOPT_OPTION_END
   };
 
diff --git a/src/merchant-tools/taler-merchant-benchmark.c 
b/src/merchant-tools/taler-merchant-benchmark.c
index 47cb106d..60cbe43d 100644
--- a/src/merchant-tools/taler-merchant-benchmark.c
+++ b/src/merchant-tools/taler-merchant-benchmark.c
@@ -490,6 +490,7 @@ main (int argc,
                                "TN",
                                "will perform TN /track operations, defaults to 
1",
                                &tracks_number),
+    GNUNET_GETOPT_option_version (PACKAGE_VERSION "-" VCS_VERSION),
     GNUNET_GETOPT_OPTION_END
   };
   const char *default_config_file;
@@ -565,7 +566,7 @@ main (int argc,
     return PG_FAILED_TO_PREPARE_MERCHANT;
   }
   GNUNET_assert (0 < strlen (merchant_url));
-  GNUNET_assert (merchant_url[strlen(merchant_url)-1] == '/');
+  GNUNET_assert (merchant_url[strlen (merchant_url) - 1] == '/');
   GNUNET_assert (0 < GNUNET_asprintf (&alt_instance_url,
                                       "%sinstances/%s/",
                                       merchant_url,
diff --git a/src/merchant-tools/taler-merchant-dbinit.c 
b/src/merchant-tools/taler-merchant-dbinit.c
index c3a77d52..b12c8d23 100644
--- a/src/merchant-tools/taler-merchant-dbinit.c
+++ b/src/merchant-tools/taler-merchant-dbinit.c
@@ -101,6 +101,7 @@ main (int argc,
                                "reset database (DANGEROUS: all existing data 
is lost!)",
                                &reset_db),
 
+    GNUNET_GETOPT_option_version (PACKAGE_VERSION "-" VCS_VERSION),
     GNUNET_GETOPT_OPTION_END
   };
   enum GNUNET_GenericReturnValue ret;
diff --git a/src/merchant-tools/taler-merchant-setup-reserve.c 
b/src/merchant-tools/taler-merchant-setup-reserve.c
index 85afea2c..f4e4d8da 100644
--- a/src/merchant-tools/taler-merchant-setup-reserve.c
+++ b/src/merchant-tools/taler-merchant-setup-reserve.c
@@ -296,6 +296,7 @@ main (int argc,
                                  "CERTTYPE",
                                  "type of the TLS client certificate, defaults 
to PEM if not specified",
                                  &certtype),
+    GNUNET_GETOPT_option_version (PACKAGE_VERSION "-" VCS_VERSION),
     GNUNET_GETOPT_option_mandatory (
       GNUNET_GETOPT_option_string ('w',
                                    "wire-method",

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