fixes for earlier fix

This commit is contained in:
Christian Grothoff 2021-01-07 22:48:50 +01:00
parent 421e802fd3
commit 3999999988
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
6 changed files with 1017 additions and 1018 deletions

View File

@ -1 +1 @@
1609929296
1610056123

View File

@ -1 +1 @@
W0KH5YAQ5YFEVP4TV362MRF3TCRX633PWG87TT45DB6TY7V6F25G
ERTZ1N5J8132YETYZ1KJ3X3CE5WPRAD5N88937AM0E45W6CSNM8G

File diff suppressed because it is too large Load Diff

View File

@ -109,8 +109,8 @@ taler-merchant-dbinit -c $CONF
# setup auditor
echo "Setting up auditor"
taler-auditor-dbinit -c $CONF
taler-auditor-exchange -c $CONF -m $MASTER_PUB -u $EXCHANGE_URL
taler-auditor-dbinit -c $CONF || exit_skip "Failed to initialize auditor DB"
taler-auditor-exchange -c $CONF -m $MASTER_PUB -u $EXCHANGE_URL || exit_skip "Failed to add exchange to auditor"
# Launch services
echo "Launching services"

View File

@ -93,14 +93,14 @@ main (int argc,
"WARNING",
NULL));
{
enum GNUNET_GenericReturnValue ret;
int ret;
ret = GNUNET_GETOPT_run ("taler-auditor-exchange",
options,
argc, argv);
if (GNUNET_NO == ret)
return 0;
if (GNUNET_OK != ret)
if (GNUNET_SYSERR == ret)
return 1;
}
if (NULL == cfgfile)

View File

@ -1,6 +1,6 @@
/*
This file is part of TALER
Copyright (C) 2014, 2015, 2016, 2018 Taler Systems SA
Copyright (C) 2014-2020 Taler Systems SA
TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU Affero General Public License as published by the Free Software
@ -570,7 +570,7 @@ main (int argc,
enum TALER_MHD_GlobalOptions go;
{
enum GNUNET_GenericReturnValue ret;
int ret;
ret = GNUNET_GETOPT_run ("taler-auditor-httpd",
options,
@ -579,7 +579,6 @@ main (int argc,
return 0;
if (GNUNET_SYSERR == ret)
return 3;
return 1;
}
go = TALER_MHD_GO_NONE;
if (auditor_connection_close)