From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 24 May 2021 13:32:00 +0000 (+0900)
Subject: sd-netlink: do not set action for RTM_GETRULE message
X-Git-Tag: v249-rc1~157^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ca619061dfc3c1367900a87f2aa9704d82989f2;p=thirdparty%2Fsystemd.git

sd-netlink: do not set action for RTM_GETRULE message

Otherwise, when NETLINK_GET_STRICT_CHK socket option is enabled, no rule
will be dumped.
---

diff --git a/src/libsystemd/sd-netlink/rtnl-message.c b/src/libsystemd/sd-netlink/rtnl-message.c
index 681c32aed14..5dba9c57342 100644
--- a/src/libsystemd/sd-netlink/rtnl-message.c
+++ b/src/libsystemd/sd-netlink/rtnl-message.c
@@ -858,7 +858,6 @@ int sd_rtnl_message_new_routing_policy_rule(sd_netlink *rtnl, sd_netlink_message
 
         frh = NLMSG_DATA((*ret)->hdr);
         frh->family = ifal_family;
-        frh->action = FR_ACT_TO_TBL;
 
         return 0;
 }
diff --git a/src/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c
index d65e198333a..3860f6df30f 100644
--- a/src/network/networkd-routing-policy-rule.c
+++ b/src/network/networkd-routing-policy-rule.c
@@ -508,11 +508,9 @@ static int routing_policy_rule_set_netlink_message(const RoutingPolicyRule *rule
                         return log_link_error_errno(link, r, "Could not append FRA_SUPPRESS_PREFIXLEN attribute: %m");
         }
 
-        if (rule->type != FR_ACT_TO_TBL) {
-                r = sd_rtnl_message_routing_policy_rule_set_fib_type(m, rule->type);
-                if (r < 0)
-                        return log_link_error_errno(link, r, "Could not append FIB rule type attribute: %m");
-        }
+        r = sd_rtnl_message_routing_policy_rule_set_fib_type(m, rule->type);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Could not append FIB rule type attribute: %m");
 
         return 0;
 }