taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix #6969

Browse Source
This commit is contained in:
Christian Grothoff 2021-08-03 14:41:42 +02:00
parent 705afeb9cc
commit 5fc2e72a2a
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/bank-lib/taler-exchange-wire-gateway-client.c
View File

@ -606,7 +606,7 @@ run (void *cls,
(NULL != auth.details.basic.password) ) (NULL != auth.details.basic.password) )
{ {
fprintf (stderr, fprintf (stderr,
"Conflicting authentication options provided. Please only use one method.\n"); "Error: Conflicting authentication options provided. Please only use one method.\n");
GNUNET_SCHEDULER_shutdown (); GNUNET_SCHEDULER_shutdown ();
return; return;
} }
@ -616,7 +616,7 @@ run (void *cls,
&auth)) &auth))
{ {
fprintf (stderr, fprintf (stderr,
"Authentication information not found in configuration section `%s'\n", "Error: Authentication information not found in configuration section `%s'\n",
account_section); account_section);
GNUNET_SCHEDULER_shutdown (); GNUNET_SCHEDULER_shutdown ();
return; return;
@ -633,16 +633,27 @@ run (void *cls,
else if (NULL == auth.wire_gateway_url) else if (NULL == auth.wire_gateway_url)
{ {
fprintf (stderr, fprintf (stderr,
"No account specified (use -b or -s options).\n"); "Error: No account specified (use -b or -s options).\n");
GNUNET_SCHEDULER_shutdown (); GNUNET_SCHEDULER_shutdown ();
return; return;
} }
} }
if ( (NULL == auth.wire_gateway_url) ||
(0 == strlen (auth.wire_gateway_url)) ||
(0 != strcasecmp ("http",
auth.wire_gateway_url)) )
{
fprintf (stderr,
"Error: Invalid wire gateway URL `%s' configured.\n",
auth.wire_gateway_url);
GNUNET_SCHEDULER_shutdown ();
return;
}
if ( (GNUNET_YES == incoming_history) && if ( (GNUNET_YES == incoming_history) &&
(GNUNET_YES == outgoing_history) ) (GNUNET_YES == outgoing_history) )
{ {
fprintf (stderr, fprintf (stderr,
"Please specify only -i or -o, but not both.\n"); "Error: Please specify only -i or -o, but not both.\n");
GNUNET_SCHEDULER_shutdown (); GNUNET_SCHEDULER_shutdown ();
return; return;
} }
@ -675,7 +686,7 @@ run (void *cls,
/** /**
* The main function of the taler-bank-transfer tool * The main function of the taler-exchange-wire-gateway-client
* *
* @param argc number of arguments from the command line * @param argc number of arguments from the command line
* @param argv command line arguments * @param argv command line arguments

3
src/util/url.c
View File

@ -240,7 +240,8 @@ TALER_url_join (const char *base_url,
if (0 == strlen (base_url)) if (0 == strlen (base_url))
{ {
/* base URL can't be empty */ /* base URL can't be empty */
GNUNET_break (0); GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Empty base URL specified\n");
return NULL; return NULL;
} }
if ('/' != base_url[strlen (base_url) - 1]) if ('/' != base_url[strlen (base_url) - 1])