-permit CNAME/PSEU despite existence of NICK, remove legacly NS logic

1 files changed, 11 insertions, 6 deletions

diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index 8c3ab0b3..3f6c58c3 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -660,7 +660,9 @@ check_record_permitted (unsigned int rd_count,
                         gint n_type)
 {
   unsigned int i;
+  unsigned int nick;
 
+  nick = 0;
   for (i=0;i<rd_count;i++)
   {
     switch (rd[i].record_type)
@@ -674,22 +676,20 @@ check_record_permitted (unsigned int rd_count,
       return GNUNET_NO;
     case GNUNET_GNSRECORD_TYPE_PKEY:
       return GNUNET_NO;
+    case GNUNET_GNSRECORD_TYPE_NICK:
+      nick++;
+      break;
     default:
       break;
     }
   }
+  rd_count -= nick;
   if (0 == rd_count)
     return GNUNET_OK;
   switch (n_type)
   {
   case GNUNET_DNSPARSER_TYPE_CNAME:
     return GNUNET_NO;
-  case GNUNET_DNSPARSER_TYPE_NS:
-    for (i=0;i<rd_count;i++)
-      if ( (GNUNET_DNSPARSER_TYPE_A != rd[i].record_type) &&
-           (GNUNET_DNSPARSER_TYPE_AAAA != rd[i].record_type) )
-        return GNUNET_NO;
-      return GNUNET_OK;
   case GNUNET_GNSRECORD_TYPE_PKEY:
     return GNUNET_NO;
   default:
@@ -1544,6 +1544,11 @@ launch_edit_dialog (gint n_type,
 {
   struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc;
 
+  if (NULL == current_zone_option)
+  {
+    GNUNET_break (0);
+    return;
+  }
   edc = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginEnvironment);
   if ( (NULL != ri) &&
        (off < ri->rd_count) )