From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 24 Jul 2024 20:08:15 +0000 (+0200)
Subject: core-varlink: merge two FLAGS_SET() where appropriate
X-Git-Tag: v257-rc1~705^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c557f6f54090d931702ba354eea07232a53b5c0c;p=thirdparty%2Fsystemd.git

core-varlink: merge two FLAGS_SET() where appropriate
---

diff --git a/src/core/core-varlink.c b/src/core/core-varlink.c
index ba6d50b504b..ac20296b858 100644
--- a/src/core/core-varlink.c
+++ b/src/core/core-varlink.c
@@ -596,7 +596,7 @@ static int vl_reply(sd_varlink *link, sd_json_variant *parameters, const char *e
         if (error_id)
                 log_debug("varlink systemd-oomd client error: %s", error_id);
 
-        if (FLAGS_SET(flags, SD_VARLINK_REPLY_ERROR) && FLAGS_SET(flags, SD_VARLINK_REPLY_LOCAL)) {
+        if (FLAGS_SET(flags, SD_VARLINK_REPLY_ERROR|SD_VARLINK_REPLY_LOCAL)) {
                 /* sd_varlink connection was closed, likely because of systemd-oomd restart. Let's try to
                  * reconnect and send the initial ManagedOOM update again. */