diff options
-rwxr-xr-x | contrib/gnunet-gns-import.sh | 1 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/contrib/gnunet-gns-import.sh b/contrib/gnunet-gns-import.sh index dacdf7887..502aeb9d8 100755 --- a/contrib/gnunet-gns-import.sh +++ b/contrib/gnunet-gns-import.sh | |||
@@ -31,6 +31,7 @@ gnunet-identity -C sks-zone $options | |||
31 | # Integrate those with the respective subsystems. | 31 | # Integrate those with the respective subsystems. |
32 | gnunet-identity -e short-zone -s gns-short $options | 32 | gnunet-identity -e short-zone -s gns-short $options |
33 | gnunet-identity -e master-zone -s gns-master $options | 33 | gnunet-identity -e master-zone -s gns-master $options |
34 | gnunet-identity -e master-zone -s gns-proxy $options | ||
34 | gnunet-identity -e private-zone -s gns-private $options | 35 | gnunet-identity -e private-zone -s gns-private $options |
35 | gnunet-identity -e sks-zone -s fs-sks $options | 36 | gnunet-identity -e sks-zone -s fs-sks $options |
36 | 37 | ||
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 8bb299c6f..2508ae68c 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -2647,14 +2647,15 @@ identity_master_cb (void *cls, | |||
2647 | if (NULL == ego) | 2647 | if (NULL == ego) |
2648 | { | 2648 | { |
2649 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 2649 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
2650 | _("No ego configured for `master-zone`\n")); | 2650 | _("No ego configured for `%s`\n"), |
2651 | "gns-proxy"); | ||
2651 | GNUNET_SCHEDULER_shutdown (); | 2652 | GNUNET_SCHEDULER_shutdown (); |
2652 | return; | 2653 | return; |
2653 | } | 2654 | } |
2654 | GNUNET_IDENTITY_ego_get_public_key (ego, | 2655 | GNUNET_IDENTITY_ego_get_public_key (ego, |
2655 | &local_gns_zone); | 2656 | &local_gns_zone); |
2656 | id_op = GNUNET_IDENTITY_get (identity, | 2657 | id_op = GNUNET_IDENTITY_get (identity, |
2657 | "shorten-zone", | 2658 | "gns-short", |
2658 | &identity_shorten_cb, | 2659 | &identity_shorten_cb, |
2659 | NULL); | 2660 | NULL); |
2660 | } | 2661 | } |
@@ -2728,7 +2729,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
2728 | identity = GNUNET_IDENTITY_connect (cfg, | 2729 | identity = GNUNET_IDENTITY_connect (cfg, |
2729 | NULL, NULL); | 2730 | NULL, NULL); |
2730 | id_op = GNUNET_IDENTITY_get (identity, | 2731 | id_op = GNUNET_IDENTITY_get (identity, |
2731 | "master-zone", | 2732 | "gns-proxy", |
2732 | &identity_master_cb, | 2733 | &identity_master_cb, |
2733 | NULL); | 2734 | NULL); |
2734 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 2735 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, |