From 719b51b65df263dbd41bc1adc9eccfdf07bcda46 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 16 Apr 2016 19:49:53 +0200
Subject: [PATCH 1/2] fix config parsing for dbinit tool

---
 src/exchange-tools/taler-exchange-dbinit.c | 92 ++++++++++++----------
 src/exchange/taler-exchange-httpd.c        |  2 +
 2 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/src/exchange-tools/taler-exchange-dbinit.c b/src/exchange-tools/taler-exchange-dbinit.c
index 9f301854f..aaa468a74 100644
--- a/src/exchange-tools/taler-exchange-dbinit.c
+++ b/src/exchange-tools/taler-exchange-dbinit.c
@@ -23,6 +23,50 @@
 #include "taler_exchangedb_plugin.h"
 
 
+
+/**
+ * Return value from main().
+ */
+static int global_ret;
+
+/**
+ * Main function that will be run.
+ *
+ * @param cls closure
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param cfg configuration
+ */
+static void
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  struct TALER_EXCHANGEDB_Plugin *plugin;
+
+  if (NULL ==
+      (plugin = TALER_EXCHANGEDB_plugin_load (cfg)))
+  {
+    fprintf (stderr,
+             "Failed to initialize database plugin.\n");
+    global_ret = 1;
+    return;
+  }
+  if (GNUNET_OK !=
+      plugin->create_tables (plugin->cls,
+                             GNUNET_NO))
+  {
+    fprintf (stderr,
+             "Failed to initialize database.\n");
+    TALER_EXCHANGEDB_plugin_unload (plugin);
+    global_ret = 1;
+    return;
+  }
+  TALER_EXCHANGEDB_plugin_unload (plugin);
+}
+
+
 /**
  * The main function of the database initialization tool.
  * Used to initialize the Taler Exchange's database.
@@ -35,57 +79,23 @@ int
 main (int argc,
       char *const *argv)
 {
-  char *cfgfile = NULL;
   const struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_CFG_FILE (&cfgfile),
-    GNUNET_GETOPT_OPTION_HELP ("Initialize Taler Exchange database"),
-    GNUNET_GETOPT_OPTION_VERSION (VERSION "-" VCS_VERSION),
     GNUNET_GETOPT_OPTION_END
   };
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-  struct TALER_EXCHANGEDB_Plugin *plugin;
-
-  if (GNUNET_GETOPT_run ("taler-exchange-dbinit",
-                         options,
-                         argc, argv) < 0)
-    return 1;
 
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_log_setup ("taler-exchange-dbinit",
                                    "INFO",
                                    NULL));
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg,
-                                                  cfgfile))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Malformed configuration file `%s', exit ...\n"),
-                cfgfile);
-    GNUNET_free_non_null (cfgfile);
-    return 1;
-  }
-  GNUNET_free_non_null (cfgfile);
-  if (NULL ==
-      (plugin = TALER_EXCHANGEDB_plugin_load (cfg)))
-  {
-    fprintf (stderr,
-             "Failed to initialize database plugin.\n");
-    GNUNET_CONFIGURATION_destroy (cfg);
-    return 1;
-  }
   if (GNUNET_OK !=
-      plugin->create_tables (plugin->cls,
-                             GNUNET_NO))
-  {
-    fprintf (stderr,
-             "Failed to initialize database.\n");
-    TALER_EXCHANGEDB_plugin_unload (plugin);
-    GNUNET_CONFIGURATION_destroy (cfg);
+      GNUNET_PROGRAM_run (argc, argv,
+                          "taler-exchange-dbinit",
+			  "Initialize Taler exchange database",
+			  options,
+			  &run, NULL))
     return 1;
-  }
-  TALER_EXCHANGEDB_plugin_unload (plugin);
-  GNUNET_CONFIGURATION_destroy (cfg);
-  return 0;
+  return global_ret;
 }
 
+
 /* end of taler-exchange-dbinit.c */
diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
index a8e9b3b08..a533a973d 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -648,6 +648,8 @@ main (int argc,
                          options,
                          argc, argv))
     return 1;
+  if (NULL == cfgfile)
+    cfgfile = GNUNET_strdup (GNUNET_OS_project_data_get ()->user_config_file);
   cfg = GNUNET_CONFIGURATION_create ();
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, cfgfile))
   {

From dda069f5f989c029242be985fe299ab289d91e67 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 16 Apr 2016 19:53:01 +0200
Subject: [PATCH 2/2] fix linker issue

---
 src/exchange-tools/taler-exchange-dbinit.c   | 4 ++++
 src/exchange-tools/taler-exchange-keycheck.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/exchange-tools/taler-exchange-dbinit.c b/src/exchange-tools/taler-exchange-dbinit.c
index aaa468a74..f936e64d6 100644
--- a/src/exchange-tools/taler-exchange-dbinit.c
+++ b/src/exchange-tools/taler-exchange-dbinit.c
@@ -83,6 +83,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-dbinit",
                                    "INFO",
diff --git a/src/exchange-tools/taler-exchange-keycheck.c b/src/exchange-tools/taler-exchange-keycheck.c
index eaca7cd61..dbe156526 100644
--- a/src/exchange-tools/taler-exchange-keycheck.c
+++ b/src/exchange-tools/taler-exchange-keycheck.c
@@ -41,6 +41,7 @@ static const struct GNUNET_CONFIGURATION_Handle *kcfg;
  */
 static int global_ret;
 
+
 /**
  * Function called on each signing key.
  *