diff options
Diffstat (limited to 'src/backend/taler-merchant-httpd.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index edf9589c..d5bc19d6 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -1140,6 +1140,7 @@ url_handler (void *cls, MHD_HTTP_METHOD_HEAD)) method = MHD_HTTP_METHOD_GET; /* MHD will deal with the rest */ + /* Find out the merchant backend instance for the request. * If there is an instance, remove the instance specification * from the beginning of the request URL. */ @@ -1171,8 +1172,8 @@ url_handler (void *cls, (NULL != hc->instance) ) { /* Override default instance access control */ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Overriding access control\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Command-line override of access control\n"); TMH_compute_auth (TMH_default_auth, &hc->instance->auth.auth_salt, &hc->instance->auth.auth_hash); @@ -1194,8 +1195,8 @@ url_handler (void *cls, (NULL != hc->instance) ) { /* Override default instance access control */ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Overriding access control\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Command-line override of access control\n"); TMH_compute_auth (TMH_default_auth, &hc->instance->auth.auth_salt, &hc->instance->auth.auth_hash); @@ -1442,11 +1443,7 @@ url_handler (void *cls, &hc->instance->auth.auth_salt, &hc->instance->auth.auth_hash)); else /* Are the credentials provided OK for CLI override? */ - auth_ok |= ( (use_default || - /* also allow default credentials if - accessed via /instances/default/ */ - (0 == strcmp ("default", - hc->instance->settings.id))) && + auth_ok |= ( use_default && (NULL != TMH_default_auth) && (NULL != auth) && (! auth_malformed) && |