diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-06-23 16:32:26 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-06-23 16:35:06 +0200 |
commit | b9e4bb72104b4871bf4443fc8a8fbb21d8c1944c (patch) | |
tree | 22b3c6b42d57f0b1d925056f53c5e3cf3a934e7e | |
parent | af8cf3fa1402728e46b648d44739ee379fb7f81d (diff) | |
download | gnunet-b9e4bb72104b4871bf4443fc8a8fbb21d8c1944c.tar.gz gnunet-b9e4bb72104b4871bf4443fc8a8fbb21d8c1944c.zip |
ignore hostname if we have unixpath
-rw-r--r-- | src/include/gnunet_gnsrecord_lib.h | 4 | ||||
-rw-r--r-- | src/util/resolver_api.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h index b3f1eb632..20846238b 100644 --- a/src/include/gnunet_gnsrecord_lib.h +++ b/src/include/gnunet_gnsrecord_lib.h | |||
@@ -499,10 +499,10 @@ GNUNET_GNSRECORD_pkey_to_zkey (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey); | |||
499 | 499 | ||
500 | 500 | ||
501 | /** | 501 | /** |
502 | * Convert an absolute domain name in the ".zkey" pTLD to the | 502 | * Convert an absolute domain name to the |
503 | * respective public key. | 503 | * respective public key. |
504 | * | 504 | * |
505 | * @param zkey string "X.zkey" where X is the public | 505 | * @param zkey string "X" where X is the public |
506 | * key in an encoding suitable for DNS labels. | 506 | * key in an encoding suitable for DNS labels. |
507 | * @param pkey set to a public key on the eliptic curve | 507 | * @param pkey set to a public key on the eliptic curve |
508 | * @return #GNUNET_SYSERR if @a zkey has the wrong syntax | 508 | * @return #GNUNET_SYSERR if @a zkey has the wrong syntax |
diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c index b2e6a4986..afebabf08 100644 --- a/src/util/resolver_api.c +++ b/src/util/resolver_api.c | |||
@@ -180,6 +180,11 @@ check_config () | |||
180 | struct sockaddr_in v4; | 180 | struct sockaddr_in v4; |
181 | struct sockaddr_in6 v6; | 181 | struct sockaddr_in6 v6; |
182 | 182 | ||
183 | if (GNUNET_OK == | ||
184 | GNUNET_CONFIGURATION_have_value (resolver_cfg, | ||
185 | "resolver", | ||
186 | "UNIXPATH")) | ||
187 | return GNUNET_OK; | ||
183 | memset (&v4, 0, sizeof (v4)); | 188 | memset (&v4, 0, sizeof (v4)); |
184 | v4.sin_addr.s_addr = htonl (INADDR_LOOPBACK); | 189 | v4.sin_addr.s_addr = htonl (INADDR_LOOPBACK); |
185 | v4.sin_family = AF_INET; | 190 | v4.sin_family = AF_INET; |