|
 |
833828 |
diff -up dovecot-2.2.9/src/lib-master/master-service.c.fixit dovecot-2.2.9/src/lib-master/master-service.c
|
|
|
833828 |
--- dovecot-2.2.9/src/lib-master/master-service.c.fixit 2013-11-24 14:37:39.000000000 +0100
|
|
|
833828 |
+++ dovecot-2.2.9/src/lib-master/master-service.c 2013-11-27 17:52:48.802843395 +0100
|
|
|
833828 |
@@ -559,6 +559,11 @@ const char *master_service_get_name(stru
|
|
|
833828 |
return service->name;
|
|
|
833828 |
}
|
|
|
833828 |
|
|
|
833828 |
+const enum master_service_flags master_service_get_flags(struct master_service *service)
|
|
|
833828 |
+{
|
|
|
833828 |
+ return service->flags;
|
|
|
833828 |
+}
|
|
|
833828 |
+
|
|
|
833828 |
void master_service_run(struct master_service *service,
|
|
|
833828 |
master_service_connection_callback_t *callback)
|
|
|
833828 |
{
|
|
|
833828 |
diff -up dovecot-2.2.9/src/lib-master/master-service.h.fixit dovecot-2.2.9/src/lib-master/master-service.h
|
|
|
833828 |
--- dovecot-2.2.9/src/lib-master/master-service.h.fixit 2013-11-24 14:37:39.000000000 +0100
|
|
|
833828 |
+++ dovecot-2.2.9/src/lib-master/master-service.h 2013-11-27 17:53:05.329705614 +0100
|
|
|
833828 |
@@ -134,6 +134,8 @@ const char *master_service_get_version_s
|
|
|
833828 |
/* Returns name of the service, as given in name parameter to _init(). */
|
|
|
833828 |
const char *master_service_get_name(struct master_service *service);
|
|
|
833828 |
|
|
|
833828 |
+const enum master_service_flags master_service_get_flags(struct master_service *service);
|
|
|
833828 |
+
|
|
|
833828 |
/* Start the service. Blocks until finished */
|
|
|
833828 |
void master_service_run(struct master_service *service,
|
|
|
833828 |
master_service_connection_callback_t *callback)
|
|
|
833828 |
diff -up dovecot-2.2.9/src/ssl-params/main.c.fixit dovecot-2.2.9/src/ssl-params/main.c
|
|
|
833828 |
--- dovecot-2.2.9/src/ssl-params/main.c.fixit 2013-11-24 14:37:39.000000000 +0100
|
|
|
833828 |
+++ dovecot-2.2.9/src/ssl-params/main.c 2013-11-27 17:51:06.664694558 +0100
|
|
|
833828 |
@@ -103,7 +103,10 @@ static void sig_chld(const siginfo_t *si
|
|
|
833828 |
if (waitpid(-1, &status, WNOHANG) < 0)
|
|
|
833828 |
i_error("waitpid() failed: %m");
|
|
|
833828 |
else if (status != 0)
|
|
|
833828 |
+ {
|
|
|
833828 |
i_error("child process failed with status %d", status);
|
|
|
833828 |
+ if(master_service_get_flags(master_service) & MASTER_SERVICE_FLAG_STANDALONE) exit(1);
|
|
|
833828 |
+ }
|
|
|
833828 |
else {
|
|
|
833828 |
/* params should have been created now. try refreshing. */
|
|
|
833828 |
ssl_params_refresh(param);
|