merchant

commit 813f441dc777206c613d0c03ec2c835649e554e4
parent e753bf256002db847a69bbcf951991fcfc6d932d
Author: Christian Grothoff <grothoff@gnunet.org>
Date:   Wed, 28 Jan 2026 08:50:08 +0100

fix #10920

Diffstat:
M
src/merchant-tools/taler-merchant-passwd.c
 | 
18
+++++++++++-------

1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/merchant-tools/taler-merchant-passwd.c b/src/merchant-tools/taler-merchant-passwd.c
@@ -55,21 +55,25 @@ run (void *cls,
   const char *pw = args[0];
   struct TALER_MERCHANTDB_InstanceAuthSettings ias;
   enum GNUNET_DB_QueryStatus qs;
+  unsigned int nxt = 1;
 
-  if (NULL != args[1])
+  if (NULL == pw)
+  {
+    pw = getenv ("TALER_MERCHANT_PASSWORD");
+    nxt = 0;
+  }
+  if (NULL == pw)
   {
     fprintf (stderr,
-             "Superfluous command-line option `%s' specified\n",
-             args[1]);
+             "New password not specified (pass on command-line or via TALER_MERCHANT_PASSWORD)\n");
     global_ret = -1;
     return;
   }
-  if (NULL == pw)
-    pw = getenv ("TALER_MERCHANT_PASSWORD");
-  if (NULL == pw)
+  if (NULL != args[nxt])
   {
     fprintf (stderr,
-             "New password not specified (pass on command-line or via TALER_MERCHANT_PASSWORD)\n");
+             "Superfluous command-line option `%s' specified\n",
+             args[nxt]);
     global_ret = -1;
     return;
   }