diff options
Diffstat (limited to 'src/auditor')
| -rw-r--r-- | src/auditor/taler-auditor-httpd_deposit-confirmation.c | 6 | ||||
| -rw-r--r-- | src/auditor/taler-helper-auditor-coins.c | 3 | ||||
| -rwxr-xr-x | src/auditor/test-auditor.sh | 4 | ||||
| -rwxr-xr-x | src/auditor/test-revocation.sh | 2 | ||||
| -rwxr-xr-x | src/auditor/test-sync.sh | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/src/auditor/taler-auditor-httpd_deposit-confirmation.c b/src/auditor/taler-auditor-httpd_deposit-confirmation.c index f4d89b7c..c7bb4f50 100644 --- a/src/auditor/taler-auditor-httpd_deposit-confirmation.c +++ b/src/auditor/taler-auditor-httpd_deposit-confirmation.c @@ -227,7 +227,7 @@ verify_and_execute_deposit_confirmation ( TALER_exchange_online_deposit_confirmation_verify ( &dc->h_contract_terms, &dc->h_wire, - NULL /* h_extensions! */, + &dc->h_policy, dc->exchange_timestamp, dc->wire_deadline, dc->refund_deadline, @@ -276,8 +276,8 @@ TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh, struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_fixed_auto ("h_contract_terms", &dc.h_contract_terms), - GNUNET_JSON_spec_fixed_auto ("h_extensions", - &dc.h_extensions), + GNUNET_JSON_spec_fixed_auto ("h_policy", + &dc.h_policy), GNUNET_JSON_spec_fixed_auto ("h_wire", &dc.h_wire), GNUNET_JSON_spec_timestamp ("exchange_timestamp", diff --git a/src/auditor/taler-helper-auditor-coins.c b/src/auditor/taler-helper-auditor-coins.c index aa3e34b7..6a9ed09d 100644 --- a/src/auditor/taler-helper-auditor-coins.c +++ b/src/auditor/taler-helper-auditor-coins.c @@ -1625,7 +1625,8 @@ deposit_cb (void *cls, &h_wire, &deposit->h_contract_terms, &deposit->coin.h_age_commitment, - NULL /* FIXME-Oec: #7270: h_extensions! */, + deposit->no_policy_details ? NULL : + &deposit->h_policy, &h_denom_pub, deposit->timestamp, &deposit->merchant_pub, diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh index c9895b6f..859b9944 100755 --- a/src/auditor/test-auditor.sh +++ b/src/auditor/test-auditor.sh @@ -102,7 +102,7 @@ function cleanup() function exit_cleanup() { echo "Running exit-cleanup" - if test ! -z ${POSTGRES_PATH:-} + if ! [[ -z ${POSTGRES_PATH:-} ]] then echo "Stopping Postgres at ${POSTGRES_PATH}" ${POSTGRES_PATH}/pg_ctl -D $TMPDIR -l /dev/null stop &> /dev/null || true @@ -2050,7 +2050,7 @@ INITDB_BIN=$(command -v initdb) || true if [[ ! -z $INITDB_BIN ]]; then echo " FOUND (in path) at" $INITDB_BIN else - HAVE_INITDB=`find /usr -name "initdb" 2> /dev/null | grep postgres` || exit_skip " MISSING" + HAVE_INITDB=`find /usr -name "initdb" 2> /dev/null | grep postgres | head -1` || exit_skip " MISSING" echo " FOUND at" `dirname $HAVE_INITDB` INITDB_BIN=`echo $HAVE_INITDB | grep bin/initdb | grep postgres | sort -n | tail -n1` fi diff --git a/src/auditor/test-revocation.sh b/src/auditor/test-revocation.sh index e21b9487..c25f15e8 100755 --- a/src/auditor/test-revocation.sh +++ b/src/auditor/test-revocation.sh @@ -96,7 +96,7 @@ function cleanup() function exit_cleanup() { echo "Running exit-cleanup" - if test ! -z ${POSTGRES_PATH:-} + if [[ ! -z ${POSTGRES_PATH:-} ]] then echo "Stopping Postgres at ${POSTGRES_PATH}" ${POSTGRES_PATH}/pg_ctl -D $TMPDIR -l /dev/null stop &> /dev/null || true diff --git a/src/auditor/test-sync.sh b/src/auditor/test-sync.sh index 174e03c6..10a2e3f7 100755 --- a/src/auditor/test-sync.sh +++ b/src/auditor/test-sync.sh @@ -32,7 +32,7 @@ function exit_fail() { # Cleanup to run whenever we exit function cleanup() { - if test ! -z ${POSTGRES_PATH:-} + if ! [[ -z ${POSTGRES_PATH:-} ]] then ${POSTGRES_PATH}/pg_ctl -D $TMPDIR stop &> /dev/null || true fi |