summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-11-25 23:39:32 +0100
committerChristian Grothoff <christian@grothoff.org>2021-11-25 23:39:32 +0100
commite3e693d8ef3e04a0efd97ea4c2f5f640bc9b1826 (patch)
tree6e956fd8f88b99a588e00b11f4e54d4663b25cf5
parent17f156abb47e11c53a0d4c8eacfdbfeb3a399dfb (diff)
downloadmerchant-e3e693d8ef3e04a0efd97ea4c2f5f640bc9b1826.tar.gz
merchant-e3e693d8ef3e04a0efd97ea4c2f5f640bc9b1826.tar.bz2
merchant-e3e693d8ef3e04a0efd97ea4c2f5f640bc9b1826.zip
fix #7105
-rw-r--r--src/backend/taler-merchant-httpd.c1
-rw-r--r--src/merchant-tools/taler-merchant-benchmark.c3
-rw-r--r--src/merchant-tools/taler-merchant-dbinit.c1
-rw-r--r--src/merchant-tools/taler-merchant-setup-reserve.c1
4 files changed, 5 insertions, 1 deletions
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",