use user_config_file as well

4 files changed, 16 insertions, 2 deletions

diff --git a/src/exchange-tools/taler-exchange-keyup.c b/src/exchange-tools/taler-exchange-keyup.c
index 2bd168cad..3d9b9761c 100644
--- a/src/exchange-tools/taler-exchange-keyup.c
+++ b/src/exchange-tools/taler-exchange-keyup.c
@@ -871,7 +871,7 @@ exchange_keys_update_denomkeys ()
  * @param cls closure
  * @param args remaining command-line arguments
  * @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param c configuration
+ * @param cfg configuration
  */
 static void
 run (void *cls,
@@ -1048,7 +1048,7 @@ main (int argc,
       char *const *argv)
 {
   const struct GNUNET_GETOPT_CommandLineOption options[] = {
-      {'m', "master-key", "FILE",
+    {'m', "master-key", "FILE",
      "master key file (private key)", 1,
      &GNUNET_GETOPT_set_filename, &masterkeyfile},
     {'o', "output", "FILE",
diff --git a/src/exchange-tools/taler-exchange-wire.c b/src/exchange-tools/taler-exchange-wire.c
index 164351271..2c11e8421 100644
--- a/src/exchange-tools/taler-exchange-wire.c
+++ b/src/exchange-tools/taler-exchange-wire.c
@@ -22,6 +22,7 @@
 #include <jansson.h>
 #include <gnunet/gnunet_json_lib.h>
 #include "taler_crypto_lib.h"
+#include "taler_util.h"
 #include "taler_wire_lib.h"
 #include "taler_signatures.h"
 
@@ -51,6 +52,7 @@ static char *output_filename;
  */
 static int global_ret;
 
+
 /**
  * Main function that will be run.
  *
@@ -211,6 +213,10 @@ main (int argc,
     GNUNET_GETOPT_OPTION_END
   };
 
+  /* force linker to link against libtalerutil; if we do
+     not do this, the linker may "optimize" libtalerutil
+     away and skip #TALER_OS_init(), which we do need */
+  (void) TALER_project_data_default ();
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_log_setup ("taler-exchange-wire",
                                    "WARNING",
diff --git a/src/include/taler_util.h b/src/include/taler_util.h
index 9e52c973f..1ac15112b 100644
--- a/src/include/taler_util.h
+++ b/src/include/taler_util.h
@@ -110,4 +110,11 @@ TALER_config_get_denom (const struct GNUNET_CONFIGURATION_Handle *cfg,
                         struct TALER_Amount *denom);
 
 
+/**
+ * Return default project data used by Taler.
+ */
+const struct GNUNET_OS_ProjectData *
+TALER_project_data_default (void);
+
+
 #endif
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 2c2ba8cda..4b493346e 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -39,6 +39,7 @@ static const struct GNUNET_OS_ProjectData taler_pd = {
   .bug_email = "taler@gnu.org",
   .homepage = "http://www.gnu.org/s/taler/",
   .config_file = "taler.conf",
+  .user_config_file = "~/.config/taler.conf",
 };