From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 18 Sep 2011 21:34:08 +0000 (+0000)
Subject: fixing #1781
X-Git-Tag: initial-import-from-subversion-38251~17027
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f8de0fca7d326d55424b33c87d77ff428dce61a1;p=oweals%2Fgnunet.git

fixing #1781
---

diff --git a/src/util/program.c b/src/util/program.c
index b64e9ae30..d89b65a39 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -218,8 +218,7 @@ GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName,
   if ((-1 ==
        (ret =
         GNUNET_GETOPT_run (binaryName, allopts, (unsigned int) argc, argv))) ||
-      ((GNUNET_OK != GNUNET_log_setup (lpfx, loglev, logfile)) ||
-       (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cc.cfgfile))))
+      (GNUNET_OK != GNUNET_log_setup (lpfx, loglev, logfile)) )
   {
     GNUNET_CONFIGURATION_destroy (cfg);
     GNUNET_free_non_null (cc.cfgfile);
@@ -229,6 +228,7 @@ GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName,
     GNUNET_free (lpfx);
     return GNUNET_SYSERR;
   }
+  (void) GNUNET_CONFIGURATION_load (cfg, cc.cfgfile);
   GNUNET_free (allopts);
   GNUNET_free (lpfx);
   if (GNUNET_OK ==