From 4562b4f0679c784be5e7af59f3aec3c0d5de3fb5 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 5 Nov 2012 13:40:39 +0000
Subject: [PATCH] -allow config-less services to start

---
 src/arm/gnunet-service-arm.c | 44 ++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index c30fc57c7..8b2c5c224 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -315,15 +315,31 @@ start_process (struct ServiceList *sl)
   binary = GNUNET_OS_get_libexec_binary_path (sl->binary);
   GNUNET_assert (NULL == sl->proc);
   if (GNUNET_YES == use_debug)
-    sl->proc =
-      do_start_process (sl->pipe_control, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
-			lsocks, loprefix, binary, "-c", sl->config, "-L",
-			"DEBUG", options, NULL);
+  {
+    if (NULL == sl->config)
+      sl->proc =
+	do_start_process (sl->pipe_control, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+			  lsocks, loprefix, binary, "-L",
+			  "DEBUG", options, NULL);
+    else
+      sl->proc =
+	do_start_process (sl->pipe_control, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+			  lsocks, loprefix, binary, "-c", sl->config, "-L",
+			  "DEBUG", options, NULL);
+  }
   else
-    sl->proc =
-      do_start_process (sl->pipe_control, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
-			lsocks, loprefix, binary, "-c", sl->config,
-			options, NULL);
+  {
+    if (NULL == sl->config)
+      sl->proc =
+	do_start_process (sl->pipe_control, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+			  lsocks, loprefix, binary, 
+			  options, NULL);
+    else
+      sl->proc =
+	do_start_process (sl->pipe_control, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+			  lsocks, loprefix, binary, "-c", sl->config,
+			  options, NULL);
+  }
   GNUNET_free (binary);
   if (sl->proc == NULL)
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to start service `%s'\n"),
@@ -1118,18 +1134,16 @@ setup_service (void *cls, const char *section)
 	(GNUNET_OK !=
 	 GNUNET_CONFIGURATION_get_value_filename (cfg, "PATHS", "DEFAULTCONFIG",
 						  &config)) ) ||
-
       (0 != STAT (config, &sbuf)))
   {
-    if (NULL == config)
-      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING, section, "CONFIG");
-    else
+    if (NULL != config)
+    {
       GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING, 
 				 section, "CONFIG",
 				 STRERROR (errno));
-    GNUNET_free (binary);
-    GNUNET_free_non_null (config);
-    return;
+      GNUNET_free (config);
+      config = NULL;
+    }
   }
   sl = GNUNET_malloc (sizeof (struct ServiceList));
   sl->name = GNUNET_strdup (section);
-- 
2.25.1