summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-08-18 23:40:04 +0200
committerChristian Grothoff <christian@grothoff.org>2019-08-18 23:40:04 +0200
commit3fe0864331282f0436687674e0474f55c6c76c46 (patch)
treefad314a85ecb2770e37d7d111c3c5f7064c93739 /src
parent482007d1fd9d3df98861a91dfccd6b28afef36c0 (diff)
fix gnunet-service-arm termination status code
Diffstat (limited to 'src')
-rw-r--r--src/arm/gnunet-service-arm.c19
-rw-r--r--src/util/service.c4
2 files changed, 12 insertions, 11 deletions
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 4e3474cb6..4b7cbec20 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/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)
diff --git a/src/util/service.c b/src/util/service.c
index d03650501..ba0271a38 100644
--- a/src/util/service.c
+++ b/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;