aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2020-02-12 23:09:35 +0100
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2020-02-12 23:09:35 +0100
commit3ea10b00b00ee045ce08f7f925c6811ecf359b3a (patch)
tree7d0a2dc5005820f0b78510833dee14fa772bfe91
parent15d3fe8a0a8f4a16397c3e6e21002136605917af (diff)
parent206866779353de518a47712d5de6082cdcb3af2e (diff)
downloadgnunet-3ea10b00b00ee045ce08f7f925c6811ecf359b3a.tar.gz
gnunet-3ea10b00b00ee045ce08f7f925c6811ecf359b3a.zip
Merge branch 'master' into schanzen/reclaim_256bit
-rw-r--r--src/gns/gnunet-service-gns_resolver.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 735742283..b3dd5470b 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -2244,7 +2244,13 @@ handle_gns_resolution_result (void *cls,
2244 break; 2244 break;
2245 2245
2246 case GNUNET_GNSRECORD_TYPE_NICK: 2246 case GNUNET_GNSRECORD_TYPE_NICK:
2247 /* ignore */ 2247 /* ignore unless specifically requested */
2248 if (GNUNET_GNSRECORD_TYPE_NICK == rh->record_type)
2249 {
2250 rd_new[rd_off].data = rd[i].data;
2251 rd_new[rd_off].data_size = rd[i].data_size;
2252 rd_off++;
2253 }
2248 break; 2254 break;
2249 2255
2250 case GNUNET_GNSRECORD_TYPE_PKEY: 2256 case GNUNET_GNSRECORD_TYPE_PKEY: