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

[gnunet]

Author: grothoff
Date: 2012-11-05 14:41:43 +0100 (Mon, 05 Nov 2012)
New Revision: 24733

Modified:
   gnunet/src/util/service.c
Log:
-allow config-less services to run

Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c   2012-11-05 13:40:39 UTC (rev 24732)
+++ gnunet/src/util/service.c   2012-11-05 13:41:43 UTC (rev 24733)
@@ -1778,8 +1778,17 @@
   }
   if (GNUNET_OK != GNUNET_log_setup (service_name, loglev, logfile))
     HANDLE_ERROR;
-  if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cfg_fn))
-    goto shutdown;
+  if (GNUNET_YES ==
+      GNUNET_DISK_file_test (cfg_fn))
+    (void) GNUNET_CONFIGURATION_load (cfg, cfg_fn);
+  else
+  {
+    (void) GNUNET_CONFIGURATION_load (cfg, NULL);
+    if (0 != strcmp (cfg_fn, GNUNET_DEFAULT_USER_CONFIG_FILE))
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                 _("Could not access configuration file `%s'\n"),
+                 cfg_fn);
+  }
   if (GNUNET_OK != setup_service (&sctx))
     goto shutdown;
   if ((1 == do_daemonize) && (GNUNET_OK != detach_terminal (&sctx)))