diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-01-30 14:47:20 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-01-30 14:47:20 +0000 |
commit | f57cbab24fb7a22fc982eb8b6c4a2d18402be460 (patch) | |
tree | aa04434af42c35c434a233e31a91da5800eeb098 /src/util/test_resolver_api.c | |
parent | e4e2c54e62f4eeba2aa2db33bd9cf75e45d99c0c (diff) | |
download | gnunet-f57cbab24fb7a22fc982eb8b6c4a2d18402be460.tar.gz gnunet-f57cbab24fb7a22fc982eb8b6c4a2d18402be460.zip |
fix #3284: support lib/MULTIARCH/ paths in installation, use GNUNET_PREFIX=@libdir@ so that we can extract the value of MULTIARCH during 'make check'
Diffstat (limited to 'src/util/test_resolver_api.c')
-rw-r--r-- | src/util/test_resolver_api.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c index 220f4bdac..c94990415 100644 --- a/src/util/test_resolver_api.c +++ b/src/util/test_resolver_api.c | |||
@@ -199,7 +199,9 @@ check_rootserver_name (void *cls, const char *hostname) | |||
199 | else | 199 | else |
200 | { | 200 | { |
201 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 201 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
202 | "Received invalid rootserver hostname `%s'.\n", hostname); | 202 | "Received invalid rootserver hostname `%s', expected `%s'\n", |
203 | hostname, | ||
204 | ROOTSERVER_NAME); | ||
203 | GNUNET_break (0); | 205 | GNUNET_break (0); |
204 | } | 206 | } |
205 | } | 207 | } |
@@ -292,11 +294,11 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
292 | 294 | ||
293 | rootserver = | 295 | rootserver = |
294 | gethostbyaddr (&rootserver_addr, sizeof (rootserver_addr), AF_INET); | 296 | gethostbyaddr (&rootserver_addr, sizeof (rootserver_addr), AF_INET); |
295 | if (rootserver == NULL) | 297 | if (NULL == rootserver) |
296 | { | 298 | { |
297 | /* Error: resolving IP addresses does not work */ | 299 | /* Error: resolving IP addresses does not work */ |
298 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 300 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
299 | _("gethostbyaddr() could not lookup hostname: %s\n"), | 301 | "gethostbyaddr() could not lookup hostname: %s\n", |
300 | hstrerror (h_errno)); | 302 | hstrerror (h_errno)); |
301 | GNUNET_break (0); | 303 | GNUNET_break (0); |
302 | } | 304 | } |