[GNUnet-SVN] r31306 - gnunet/src/util

[gnunet]

Author: wachs
Date: 2013-12-12 14:42:16 +0100 (Thu, 12 Dec 2013)
New Revision: 31306

Modified:
   gnunet/src/util/program.c
Log:
do not start with malformed configuration


Modified: gnunet/src/util/program.c
===================================================================
--- gnunet/src/util/program.c   2013-12-12 13:36:21 UTC (rev 31305)
+++ gnunet/src/util/program.c   2013-12-12 13:42:16 UTC (rev 31306)
@@ -253,10 +253,23 @@
     cc.cfgfile = GNUNET_strdup (cfg_fn);
   if (GNUNET_YES ==
       GNUNET_DISK_file_test (cc.cfgfile))
-    (void) GNUNET_CONFIGURATION_load (cfg, cc.cfgfile);
+  {
+    if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, cc.cfgfile))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  _("Malformed configuration file `%s', exit ...\n"),
+                  cc.cfgfile);
+      return GNUNET_SYSERR;
+    }
+  }
   else
   {
-    (void) GNUNET_CONFIGURATION_load (cfg, NULL);
+    if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, NULL))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  _("Malformed configuration, exit ...\n"));
+      return GNUNET_SYSERR;
+    }
     if (0 != strcmp (cc.cfgfile, cfg_fn))
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  _("Could not access configuration file `%s'\n"),