diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-07-03 12:42:08 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-08-29 18:01:26 +0900 |
| commit | 07acd0d90b34d452b31492239fcaac6faad45acb (patch) | |
| tree | 3850c174b400912ffb76e135f21a6e351cde956e | |
| parent | c08ab4a013e96151dea9639f2fc90de504f526b7 (diff) | |
| download | systemd-07acd0d90b34d452b31492239fcaac6faad45acb.tar.gz | |
sd-netlink: drop 'flags' argument from sd_nfnl_nft_message_new_table()
| -rw-r--r-- | src/libsystemd/sd-netlink/netlink-message-nfnl.c | 5 | ||||
| -rw-r--r-- | src/shared/firewall-util-nft.c | 2 | ||||
| -rw-r--r-- | src/systemd/sd-netlink.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/libsystemd/sd-netlink/netlink-message-nfnl.c b/src/libsystemd/sd-netlink/netlink-message-nfnl.c index 03f70f606f..ffcffb82f8 100644 --- a/src/libsystemd/sd-netlink/netlink-message-nfnl.c +++ b/src/libsystemd/sd-netlink/netlink-message-nfnl.c @@ -164,13 +164,12 @@ int sd_nfnl_nft_message_new_table( sd_netlink *nfnl, sd_netlink_message **ret, int family, - const char *table, - uint16_t flags) { + const char *table) { _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL; int r; - r = nft_message_new(nfnl, &m, family, NFT_MSG_NEWTABLE, NLM_F_CREATE | flags); + r = nft_message_new(nfnl, &m, family, NFT_MSG_NEWTABLE, NLM_F_CREATE | NLM_F_EXCL | NLM_F_ACK); if (r < 0) return r; diff --git a/src/shared/firewall-util-nft.c b/src/shared/firewall-util-nft.c index e68978d777..d6beaf20d8 100644 --- a/src/shared/firewall-util-nft.c +++ b/src/shared/firewall-util-nft.c @@ -649,7 +649,7 @@ static int fw_nftables_init_family(sd_netlink *nfnl, int family) { msgcnt++; assert(msgcnt < NFT_INIT_MSGS); /* Set F_EXCL so table add fails if the table already exists. */ - r = sd_nfnl_nft_message_new_table(nfnl, &batch[msgcnt], family, NFT_SYSTEMD_TABLE_NAME, NLM_F_EXCL | NLM_F_ACK); + r = sd_nfnl_nft_message_new_table(nfnl, &batch[msgcnt], family, NFT_SYSTEMD_TABLE_NAME); if (r < 0) goto out_unref; diff --git a/src/systemd/sd-netlink.h b/src/systemd/sd-netlink.h index c513d26071..c67ea87540 100644 --- a/src/systemd/sd-netlink.h +++ b/src/systemd/sd-netlink.h @@ -229,7 +229,7 @@ int sd_nfnl_message_batch_end(sd_netlink *nfnl, sd_netlink_message **ret); int sd_nfnl_nft_message_del_table(sd_netlink *nfnl, sd_netlink_message **ret, int family, const char *table); int sd_nfnl_nft_message_new_table(sd_netlink *nfnl, sd_netlink_message **ret, - int family, const char *table, uint16_t nl_flags); + int family, const char *table); int sd_nfnl_nft_message_new_basechain(sd_netlink *nfnl, sd_netlink_message **ret, int family, const char *table, const char *chain, const char *type, uint8_t hook, int prio); |