From 3ca619061dfc3c1367900a87f2aa9704d82989f2 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 24 May 2021 22:32:00 +0900 Subject: [PATCH] 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. --- src/libsystemd/sd-netlink/rtnl-message.c | 1 - src/network/networkd-routing-policy-rule.c | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/libsystemd/sd-netlink/rtnl-message.c b/src/libsystemd/sd-netlink/rtnl-message.c index 681c32aed1..5dba9c5734 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 d65e198333..3860f6df30 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; } -- 2.25.1