aboutsummaryrefslogtreecommitdiff
path: root/src/gns/gnunet-gns.c
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-12-02 17:34:07 +0000
committerng0 <ng0@n0.is>2019-12-02 17:34:07 +0000
commit339d7a7d8ca789f9777501c3092e5c7ea0c4850a (patch)
tree5110bf9188f3c0c6d102cd4bf45d2325a5ff4136 /src/gns/gnunet-gns.c
parent79ff68acae7e4774881d6bc53fc5c639da4a2e7b (diff)
parentfdf8c95a33fe6c81c93cd17ed7a38b8b55df7d54 (diff)
downloadgnunet-339d7a7d8ca789f9777501c3092e5c7ea0c4850a.tar.gz
gnunet-339d7a7d8ca789f9777501c3092e5c7ea0c4850a.zip
Merge branch 'master' into netbsd-supportnetbsd-support
Diffstat (limited to 'src/gns/gnunet-gns.c')
-rw-r--r--src/gns/gnunet-gns.c8
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"))