aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2020-02-13 15:15:34 +0100
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2020-02-13 15:15:34 +0100
commitf0b50570e6f62c4f7734d35bc56dd99099a4ad2a (patch)
tree5770d6aa0df04e65fddb179ef525875f4bf2371a
parent967128436023d0a7364dfe8b661d6cd4542d6a96 (diff)
parent4dc95a504310abbd9b7b6d84737cc92d396553a7 (diff)
downloadgnunet-f0b50570e6f62c4f7734d35bc56dd99099a4ad2a.tar.gz
gnunet-f0b50570e6f62c4f7734d35bc56dd99099a4ad2a.zip
Merge branch 'master' into schanzen/reclaim_256bit
-rw-r--r--src/gns/gnunet-service-gns_resolver.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index f442e4018..8b621515d 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -2243,16 +2243,6 @@ handle_gns_resolution_result (void *cls,
2243 } 2243 }
2244 break; 2244 break;
2245 2245
2246 case GNUNET_GNSRECORD_TYPE_NICK:
2247 /* ignore unless specifically requested */
2248 if (0 == strcmp (GNUNET_GNS_EMPTY_LABEL_AT, rh->name))
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 }
2254 break;
2255
2256 case GNUNET_GNSRECORD_TYPE_PKEY: 2246 case GNUNET_GNSRECORD_TYPE_PKEY:
2257 { 2247 {
2258 struct GNUNET_CRYPTO_EcdsaPublicKey pub; 2248 struct GNUNET_CRYPTO_EcdsaPublicKey pub;