diff options
Diffstat (limited to 'src/peerinfo-tool/gnunet-peerinfo.c')
-rw-r--r-- | src/peerinfo-tool/gnunet-peerinfo.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/peerinfo-tool/gnunet-peerinfo.c b/src/peerinfo-tool/gnunet-peerinfo.c index f4a9d3aa6..eb69a0804 100644 --- a/src/peerinfo-tool/gnunet-peerinfo.c +++ b/src/peerinfo-tool/gnunet-peerinfo.c | |||
@@ -654,12 +654,11 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
654 | if ( (GNUNET_YES == get_self) || (GNUNET_YES == get_uri) || (NULL != dump_hello) ) | 654 | if ( (GNUNET_YES == get_self) || (GNUNET_YES == get_uri) || (NULL != dump_hello) ) |
655 | { | 655 | { |
656 | /* load private key */ | 656 | /* load private key */ |
657 | if (GNUNET_OK != | 657 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "PEER", |
658 | GNUNET_CONFIGURATION_get_value_filename (cfg, "PEER", "PRIVATE_KEY", | 658 | "PRIVATE_KEY", |
659 | &fn)) | 659 | &fn)) |
660 | { | 660 | { |
661 | FPRINTF (stderr, _("Could not find option `%s:%s' in configuration.\n"), | 661 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "PEER", "PRIVATE_KEY"); |
662 | "GNUNETD", "HOSTKEYFILE"); | ||
663 | return; | 662 | return; |
664 | } | 663 | } |
665 | if (NULL == (priv = GNUNET_CRYPTO_eddsa_key_create_from_file (fn))) | 664 | if (NULL == (priv = GNUNET_CRYPTO_eddsa_key_create_from_file (fn))) |
@@ -670,7 +669,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
670 | } | 669 | } |
671 | GNUNET_free (fn); | 670 | GNUNET_free (fn); |
672 | GNUNET_CRYPTO_eddsa_key_get_public (priv, | 671 | GNUNET_CRYPTO_eddsa_key_get_public (priv, |
673 | &my_peer_identity.public_key); | 672 | &my_peer_identity.public_key); |
674 | GNUNET_free (priv); | 673 | GNUNET_free (priv); |
675 | } | 674 | } |
676 | 675 | ||
@@ -780,9 +779,9 @@ main (int argc, char *const *argv) | |||
780 | {'i', "info", NULL, | 779 | {'i', "info", NULL, |
781 | gettext_noop ("list all known peers"), | 780 | gettext_noop ("list all known peers"), |
782 | 0, &GNUNET_GETOPT_set_one, &get_info}, | 781 | 0, &GNUNET_GETOPT_set_one, &get_info}, |
783 | {'d', "dump-hello", NULL, | 782 | {'d', "dump-hello", NULL, |
784 | gettext_noop ("dump hello to file"), | 783 | gettext_noop ("dump hello to file"), |
785 | 1, &GNUNET_GETOPT_set_string, &dump_hello}, | 784 | 1, &GNUNET_GETOPT_set_string, &dump_hello}, |
786 | {'g', "get-hello", NULL, | 785 | {'g', "get-hello", NULL, |
787 | gettext_noop ("also output HELLO uri(s)"), | 786 | gettext_noop ("also output HELLO uri(s)"), |
788 | 0, &GNUNET_GETOPT_set_one, &get_uri}, | 787 | 0, &GNUNET_GETOPT_set_one, &get_uri}, |