diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-08-18 23:40:04 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-08-18 23:40:04 +0200 |
commit | 3fe0864331282f0436687674e0474f55c6c76c46 (patch) | |
tree | fad314a85ecb2770e37d7d111c3c5f7064c93739 /src | |
parent | 482007d1fd9d3df98861a91dfccd6b28afef36c0 (diff) | |
download | gnunet-3fe0864331282f0436687674e0474f55c6c76c46.tar.gz gnunet-3fe0864331282f0436687674e0474f55c6c76c46.zip |
fix gnunet-service-arm termination status code
Diffstat (limited to 'src')
-rw-r--r-- | src/arm/gnunet-service-arm.c | 19 | ||||
-rw-r--r-- | src/util/service.c | 4 |
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, | |||
2279 | shc_chld = | 2279 | shc_chld = |
2280 | GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD, | 2280 | GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD, |
2281 | &sighandler_child_death); | 2281 | &sighandler_child_death); |
2282 | if ( GNUNET_OK != GNUNET_SERVICE_run_ (argc, | 2282 | if (0 != |
2283 | argv, | 2283 | GNUNET_SERVICE_run_ (argc, |
2284 | "arm", | 2284 | argv, |
2285 | GNUNET_SERVICE_OPTION_MANUAL_SHUTDOWN, | 2285 | "arm", |
2286 | &run, | 2286 | GNUNET_SERVICE_OPTION_MANUAL_SHUTDOWN, |
2287 | &client_connect_cb, | 2287 | &run, |
2288 | &client_disconnect_cb, | 2288 | &client_connect_cb, |
2289 | NULL, | 2289 | &client_disconnect_cb, |
2290 | handlers)) | 2290 | NULL, |
2291 | handlers)) | ||
2291 | global_ret = 2; | 2292 | global_ret = 2; |
2292 | #if HAVE_WAIT4 | 2293 | #if HAVE_WAIT4 |
2293 | if (NULL != wait_file) | 2294 | 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 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file util/service_new.c | 22 | * @file util/service.c |
23 | * @brief functions related to starting services (redesign) | 23 | * @brief functions related to starting services (redesign) |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | * @author Florian Dold | 25 | * @author Florian Dold |
@@ -2304,7 +2304,7 @@ GNUNET_SERVICE_run_ (int argc, | |||
2304 | sh.cb_cls = cls; | 2304 | sh.cb_cls = cls; |
2305 | sh.handlers = GNUNET_MQ_copy_handlers (handlers); | 2305 | sh.handlers = GNUNET_MQ_copy_handlers (handlers); |
2306 | sh.service_name = service_name; | 2306 | sh.service_name = service_name; |
2307 | 2307 | sh.ret = 0; | |
2308 | /* setup subsystems */ | 2308 | /* setup subsystems */ |
2309 | loglev = NULL; | 2309 | loglev = NULL; |
2310 | logfile = NULL; | 2310 | logfile = NULL; |