[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33602 - gnunet/src/namestore gnunet-gtk/src/namestore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33602 - gnunet/src/namestore gnunet-gtk/src/namestore |
Date: |
Sun, 8 Jun 2014 14:23:21 +0200 |
Author: grothoff
Date: 2014-06-08 14:23:21 +0200 (Sun, 08 Jun 2014)
New Revision: 33602
Modified:
gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
gnunet/src/namestore/gnunet-namestore.c
Log:
-fix #3301
Modified: gnunet/src/namestore/gnunet-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-namestore.c 2014-06-08 12:20:00 UTC (rev
33601)
+++ gnunet/src/namestore/gnunet-namestore.c 2014-06-08 12:23:21 UTC (rev
33602)
@@ -501,18 +501,46 @@
ret = 1;
test_finished ();
return;
- case GNUNET_DNSPARSER_TYPE_NS:
- if ( (GNUNET_DNSPARSER_TYPE_A == type) ||
- (GNUNET_DNSPARSER_TYPE_AAAA == type) )
- break;
+ }
+ }
+ switch (type)
+ {
+ case GNUNET_DNSPARSER_TYPE_CNAME:
+ if (0 != rd_count)
+ {
fprintf (stderr,
- _("A %s record exists already under `%s', only A/AAAA records
can be added.\n"),
- "NS",
- rec_name);
+ _("Records already exist under `%s', cannot add `%s'
record.\n"),
+ rec_name,
+ "CNAME");
ret = 1;
test_finished ();
return;
}
+ break;
+ case GNUNET_GNSRECORD_TYPE_PKEY:
+ if (0 != rd_count)
+ {
+ fprintf (stderr,
+ _("Records already exist under `%s', cannot add `%s'
record.\n"),
+ rec_name,
+ "PKEY");
+ ret = 1;
+ test_finished ();
+ return;
+ }
+ break;
+ case GNUNET_GNSRECORD_TYPE_GNS2DNS:
+ if (0 != rd_count)
+ {
+ fprintf (stderr,
+ _("Records already exist under `%s', cannot add `%s'
record.\n"),
+ rec_name,
+ "GNS2DNS");
+ ret = 1;
+ test_finished ();
+ return;
+ }
+ break;
}
memset (rdn, 0, sizeof (struct GNUNET_GNSRECORD_Data));
memcpy (&rdn[1], rd, rd_count * sizeof (struct GNUNET_GNSRECORD_Data));
Modified: gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
===================================================================
--- gnunet-gtk/src/namestore/gnunet-namestore-gtk.c 2014-06-08 12:20:00 UTC
(rev 33601)
+++ gnunet-gtk/src/namestore/gnunet-namestore-gtk.c 2014-06-08 12:23:21 UTC
(rev 33602)
@@ -682,13 +682,10 @@
{
case GNUNET_DNSPARSER_TYPE_CNAME:
return GNUNET_NO;
- case GNUNET_DNSPARSER_TYPE_NS:
- if ( (GNUNET_DNSPARSER_TYPE_A == n_type) ||
- (GNUNET_DNSPARSER_TYPE_AAAA == n_type) )
- return GNUNET_OK;
- return GNUNET_NO;
case GNUNET_GNSRECORD_TYPE_PKEY:
return GNUNET_NO;
+ case GNUNET_GNSRECORD_TYPE_GNS2DNS:
+ return GNUNET_NO;
case GNUNET_GNSRECORD_TYPE_NICK:
nick++;
break;
@@ -705,6 +702,8 @@
return GNUNET_NO;
case GNUNET_GNSRECORD_TYPE_PKEY:
return GNUNET_NO;
+ case GNUNET_GNSRECORD_TYPE_GNS2DNS:
+ return GNUNET_NO;
default:
break;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33602 - gnunet/src/namestore gnunet-gtk/src/namestore,
gnunet <=