diff options
author | ng0 <ng0@n0.is> | 2019-12-01 12:04:19 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-12-01 12:04:19 +0000 |
commit | 492a887121d7ddd5aa35450cf35cfd0fc3b5d239 (patch) | |
tree | 4a8015ba86de98f103f60fe589d41cf4025286a1 | |
parent | aede79a15277a74a799e958df97b2f7fd0a8b001 (diff) | |
parent | 520dce09be20c1961f0c419e46a773f3247683cc (diff) | |
download | gnunet-492a887121d7ddd5aa35450cf35cfd0fc3b5d239.tar.gz gnunet-492a887121d7ddd5aa35450cf35cfd0fc3b5d239.zip |
Merge branch 'master' of gnunet.org:gnunet
-rw-r--r-- | src/gns/gnunet-gns.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c index fe51013ed..600a9c9a5 100644 --- a/src/gns/gnunet-gns.c +++ b/src/gns/gnunet-gns.c | |||
@@ -229,7 +229,6 @@ run (void *cls, | |||
229 | (void) cls; | 229 | (void) cls; |
230 | (void) args; | 230 | (void) args; |
231 | (void) cfgfile; | 231 | (void) cfgfile; |
232 | Idna_rc rc; | ||
233 | 232 | ||
234 | cfg = c; | 233 | cfg = c; |
235 | to_task = NULL; | 234 | to_task = NULL; |
@@ -239,12 +238,15 @@ run (void *cls, | |||
239 | if (NULL != (colon = strchr (lookup_name, ':'))) | 238 | if (NULL != (colon = strchr (lookup_name, ':'))) |
240 | *colon = '\0'; | 239 | *colon = '\0'; |
241 | } | 240 | } |
241 | #ifdef LSD001 | ||
242 | Idna_rc rc; | ||
242 | /** | 243 | /** |
243 | * If DNS compatibility is requested, we first verify that the | 244 | * If DNS compatibility is requested, we first verify that the |
244 | * lookup_name is in a DNS format. If yes, we convert it to UTF-8. | 245 | * lookup_name is in a DNS format. If yes, we convert it to UTF-8. |
245 | */ | 246 | */ |
246 | if (GNUNET_YES == dns_compat) | 247 | if (GNUNET_YES == dns_compat) |
247 | { | 248 | { |
249 | #endif | ||
248 | if (GNUNET_OK != GNUNET_DNSPARSER_check_name (lookup_name)) | 250 | if (GNUNET_OK != GNUNET_DNSPARSER_check_name (lookup_name)) |
249 | { | 251 | { |
250 | fprintf (stderr, | 252 | fprintf (stderr, |
@@ -253,6 +255,7 @@ run (void *cls, | |||
253 | global_ret = 3; | 255 | global_ret = 3; |
254 | return; | 256 | return; |
255 | } | 257 | } |
258 | #ifdef LSD001 | ||
256 | if (IDNA_SUCCESS != | 259 | if (IDNA_SUCCESS != |
257 | (rc = idna_to_unicode_8z8z (lookup_name, &idna_name, | 260 | (rc = idna_to_unicode_8z8z (lookup_name, &idna_name, |
258 | IDNA_ALLOW_UNASSIGNED))) | 261 | IDNA_ALLOW_UNASSIGNED))) |
@@ -261,11 +264,12 @@ run (void *cls, | |||
261 | _ ("Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"), | 264 | _ ("Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"), |
262 | lookup_name, | 265 | lookup_name, |
263 | idna_strerror (rc)); | 266 | idna_strerror (rc)); |
264 | global_ret = 3; | 267 | global_ret = 4; |
265 | return; | 268 | return; |
266 | } | 269 | } |
267 | lookup_name = idna_name; | 270 | lookup_name = idna_name; |
268 | } | 271 | } |
272 | #endif | ||
269 | if (GNUNET_YES != | 273 | if (GNUNET_YES != |
270 | GNUNET_CLIENT_test (cfg, | 274 | GNUNET_CLIENT_test (cfg, |
271 | "arm")) | 275 | "arm")) |