hotfix for #4760, full fix is more complex

3 files changed, 2 insertions, 158 deletions

diff --git a/src/setup/gnunet-setup-namestore-config.c b/src/setup/gnunet-setup-namestore-config.c
index d03ca554..a664d39b 100644
--- a/src/setup/gnunet-setup-namestore-config.c
+++ b/src/setup/gnunet-setup-namestore-config.c
@@ -88,8 +88,8 @@ GNUNET_setup_namestore_postgres_tab_test_button_clicked_cb (GtkWidget * widget,
 static void
 restart_namestore ()
 {
-  GNUNET_SCHEDULER_add_now (&GNUNET_SETUP_restart_namestore,
-                            NULL);
+  /* FIXME */
+  GNUNET_break (0); /* not implemented */
 }
 
 
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 7ab9ca70..d4da0554 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -54,21 +54,6 @@ struct GNUNET_CONFIGURATION_Handle *cfg;
 static int gret;
 
 /**
- * Resolver process handle.
- */
-static struct GNUNET_OS_Process *resolver;
-
-/**
- * Namestore process handle.
- */
-static struct GNUNET_OS_Process *namestore;
-
-/**
- * Identity process handle.
- */
-static struct GNUNET_OS_Process *identity;
-
-/**
  * Run autoconfig-only and then exit immediately.
  */
 static int do_autoconfig;
@@ -378,51 +363,6 @@ cleanup_task (void *cls)
   if (GNUNET_OK != write_configuration ())
     gret = 1;
   cfg = NULL;
-  if (NULL != resolver)
-  {
-    GNUNET_break (0 == GNUNET_OS_process_kill (resolver, SIGTERM));
-    GNUNET_OS_process_destroy (resolver);
-    resolver = NULL;
-  }
-  if (NULL != namestore)
-  {
-    GNUNET_break (0 == GNUNET_OS_process_kill (namestore, SIGTERM));
-    GNUNET_OS_process_destroy (namestore);
-    namestore = NULL;
-  }
-  if (NULL != identity)
-  {
-    GNUNET_break (0 == GNUNET_OS_process_kill (identity, SIGTERM));
-    GNUNET_OS_process_destroy (identity);
-    identity = NULL;
-  }
-}
-
-
-/**
- * Write configuration to dis, (re)start the namestore process and
- * reload the namestore models.
- *
- *
- * @param cls closure (unused)
- */
-void
-GNUNET_SETUP_restart_namestore (void *cls)
-{
-  if (GNUNET_OK != write_configuration ())
-    return; /* no point in re-starting namestore ... */
-  if (NULL != namestore)
-  {
-    GNUNET_break (0 == GNUNET_OS_process_kill (namestore, SIGTERM));
-    GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (namestore));
-    GNUNET_OS_process_destroy (namestore);
-    namestore = NULL;
-  }
-  namestore =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL,
-                             NULL, NULL, NULL,
-                             "gnunet-service-namestore",
-                             "gnunet-service-namestore", NULL);
 }
 
 
@@ -436,79 +376,6 @@ GNUNET_SETUP_quit_cb (GObject * object, gpointer user_data)
 }
 
 
-/**
- * If the test failed, start the resolver process.
- *
- * @param cls closure, NULL
- * @param result #GNUNET_YES if the service is running
- */
-static void
-start_resolver (void *cls,
-                int result)
-{
-  char *binary;
-
-  if (GNUNET_YES == result)
-    return;
-  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
-  resolver =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL,
-                             NULL,NULL, NULL,
-                             binary,
-                             "gnunet-service-resolver", NULL);
-  GNUNET_free (binary);
-}
-
-
-/**
- * If the test failed, start the identity process.
- *
- * @param cls closure, NULL
- * @param result #GNUNET_YES if the service is running
- */
-static void
-start_identity (void *cls,
-                int result)
-{
-  char *binary;
-
-  if (GNUNET_YES == result)
-    return;
-  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-identity");
-  identity =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL,
-                             NULL, NULL, NULL,
-                             binary,
-                             "gnunet-service-identity", NULL);
-  GNUNET_free (binary);
-}
-
-
-/**
- * If the test failed, start the namestore process.
- *
- * @param cls closure, NULL
- * @param result #GNUNET_YES if the service is running
- */
-static void
-start_namestore (void *cls,
-                 int result)
-{
-  char *binary;
-
-  if (GNUNET_YES == result)
-    return;
-  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-namestore");
-  namestore =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL,
-                             NULL, NULL, NULL,
-                             binary,
-                             "gnunet-service-namestore", NULL);
-  GNUNET_free (binary);
-}
-
-
-
 #ifndef MINGW
 /**
  * Try elevating user priviledges to run as user 'gnunet' or 'root'.
@@ -650,18 +517,6 @@ run (void *cls)
   main_window = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_dialog"));
   main_window = GNUNET_GTK_plug_me ("GNUNET_FS_GTK_PLUG",
                                     main_window);
-  GNUNET_CLIENT_service_test ("resolver",
-                              cfg,
-                              GNUNET_CONSTANTS_SERVICE_TIMEOUT,
-                              &start_resolver, NULL);
-  GNUNET_CLIENT_service_test ("namestore",
-                              cfg,
-                              GNUNET_CONSTANTS_SERVICE_TIMEOUT,
-                              &start_namestore, NULL);
-  GNUNET_CLIENT_service_test ("identity",
-                              cfg,
-                              GNUNET_CONSTANTS_SERVICE_TIMEOUT,
-                              &start_identity, NULL);
   load_options ();
   GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL);
   if (do_autoconfig)
diff --git a/src/setup/gnunet-setup.h b/src/setup/gnunet-setup.h
index 40fd6e2e..fde0b27a 100644
--- a/src/setup/gnunet-setup.h
+++ b/src/setup/gnunet-setup.h
@@ -58,17 +58,6 @@ enum GNUNET_GTK_SETUP_HostlistUrlModelColumns
 GObject *
 GNUNET_SETUP_get_object (const char *name);
 
-
-/**
- * Write configuration to dis, (re)start the namestore process and
- * reload the namestore models.
- *
- *
- * @param cls closure (unused)
- */
-void
-GNUNET_SETUP_restart_namestore (void *cls);
-
 /**
  * Our configuration.
  */