[GNUnet-SVN] r29387 - in gnunet: contrib src/gns

[gnunet]

Author: grothoff
Date: 2013-09-18 17:51:35 +0200 (Wed, 18 Sep 2013)
New Revision: 29387

Modified:
   gnunet/contrib/gnunet-gns-import.sh
   gnunet/src/gns/gnunet-gns-proxy.c
Log:
improve GNS zone / subsystem mappings

Modified: gnunet/contrib/gnunet-gns-import.sh
===================================================================
--- gnunet/contrib/gnunet-gns-import.sh 2013-09-18 15:48:02 UTC (rev 29386)
+++ gnunet/contrib/gnunet-gns-import.sh 2013-09-18 15:51:35 UTC (rev 29387)
@@ -31,6 +31,7 @@
 # Integrate those with the respective subsystems.
 gnunet-identity -e short-zone -s gns-short $options
 gnunet-identity -e master-zone -s gns-master $options
+gnunet-identity -e master-zone -s gns-proxy $options
 gnunet-identity -e private-zone -s gns-private $options
 gnunet-identity -e sks-zone -s fs-sks $options
 

Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c   2013-09-18 15:48:02 UTC (rev 29386)
+++ gnunet/src/gns/gnunet-gns-proxy.c   2013-09-18 15:51:35 UTC (rev 29387)
@@ -2647,14 +2647,15 @@
   if (NULL == ego)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-               _("No ego configured for `master-zone`\n"));
+               _("No ego configured for `%s`\n"),
+               "gns-proxy");
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
   GNUNET_IDENTITY_ego_get_public_key (ego,
                                      &local_gns_zone);
   id_op = GNUNET_IDENTITY_get (identity,
-                              "shorten-zone",
+                              "gns-short",
                               &identity_shorten_cb,
                               NULL);
 }
@@ -2728,7 +2729,7 @@
   identity = GNUNET_IDENTITY_connect (cfg,
                                      NULL, NULL);  
   id_op = GNUNET_IDENTITY_get (identity,
-                              "master-zone",
+                              "gns-proxy",
                               &identity_master_cb,
                               NULL);  
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,