Browse Source

fix gnunet-service-arm termination status code

Christian Grothoff 9 months ago
parent
commit
3fe0864331
2 changed files with 12 additions and 11 deletions
  1. 10 9
      src/arm/gnunet-service-arm.c
  2. 2 2
      src/util/service.c

+ 10 - 9
src/arm/gnunet-service-arm.c

@@ -2279,15 +2279,16 @@ main (int argc,
   shc_chld =
     GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD,
                                    &sighandler_child_death);
-  if ( GNUNET_OK != GNUNET_SERVICE_run_ (argc,
-                             argv,
-                             "arm",
-                             GNUNET_SERVICE_OPTION_MANUAL_SHUTDOWN,
-                             &run,
-                             &client_connect_cb,
-                             &client_disconnect_cb,
-                             NULL,
-                             handlers))
+  if (0 !=
+      GNUNET_SERVICE_run_ (argc,
+			   argv,
+			   "arm",
+			   GNUNET_SERVICE_OPTION_MANUAL_SHUTDOWN,
+			   &run,
+			   &client_connect_cb,
+			   &client_disconnect_cb,
+			   NULL,
+			   handlers))
     global_ret = 2;
 #if HAVE_WAIT4
   if (NULL != wait_file)

+ 2 - 2
src/util/service.c

@@ -19,7 +19,7 @@
 */
 
 /**
- * @file util/service_new.c
+ * @file util/service.c
  * @brief functions related to starting services (redesign)
  * @author Christian Grothoff
  * @author Florian Dold
@@ -2304,7 +2304,7 @@ GNUNET_SERVICE_run_ (int argc,
   sh.cb_cls = cls;
   sh.handlers = GNUNET_MQ_copy_handlers (handlers);
   sh.service_name = service_name;
-
+  sh.ret = 0;
   /* setup subsystems */
   loglev = NULL;
   logfile = NULL;