From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 3 Sep 2025 13:00:46 +0000 (+0300)
Subject: doveadm: Replace master_service_is_killed() calls with doveadm_is_killed()
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60d8a292bdc2a203661ca10536aebcdd238f8cb7;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: Replace master_service_is_killed() calls with doveadm_is_killed()
---

diff --git a/src/doveadm/doveadm-auth.c b/src/doveadm/doveadm-auth.c
index 1b015e874c..3c3992600e 100644
--- a/src/doveadm/doveadm-auth.c
+++ b/src/doveadm/doveadm-auth.c
@@ -277,7 +277,7 @@ static void auth_connected(struct auth_client *client,
 	const char *error;
 
 	if (!connected) {
-		if (master_service_is_killed(master_service))
+		if (doveadm_is_killed())
 			return;
 		i_fatal("Couldn't connect to auth socket");
 	}
diff --git a/src/doveadm/doveadm-mail-server.c b/src/doveadm/doveadm-mail-server.c
index 953ab05410..701b793d39 100644
--- a/src/doveadm/doveadm-mail-server.c
+++ b/src/doveadm/doveadm-mail-server.c
@@ -23,8 +23,7 @@
 #define DOVEADM_SERVER_QUEUE_MAX 16
 
 #define DOVEADM_MAIL_SERVER_FAILED(ctx) \
-	((ctx)->server_connect_failure || \
-	 master_service_is_killed(master_service))
+	((ctx)->server_connect_failure || doveadm_is_killed())
 
 struct doveadm_server {
 	/* hostname:port or UNIX socket path. Used mainly for logging. */
@@ -873,7 +872,7 @@ void doveadm_mail_server_flush(struct doveadm_mail_cmd_context *ctx)
 		io_loop_run(current_ioloop);
 
 	doveadm_clients_destroy_all();
-	if (master_service_is_killed(master_service))
+	if (doveadm_is_killed())
 		e_error(ctx->cctx->event, "Aborted");
 	if (DOVEADM_MAIL_SERVER_FAILED(ctx))
 		doveadm_mail_failed_error(ctx, MAIL_ERROR_TEMP);