From 3c1471d9ca71e0cf8091f5a5eae06aae5ec5e04d Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 2 Nov 2022 23:30:20 +0100 Subject: [PATCH] libnm: export nm_setting_ip_config_get_dhcp_iaid The export was left out when the symbol was added; apparently by accident. Let's also bump the documented version of when is the symbol supposed to be available, because it actually wasn't. Fixes: 56a1a5426af5 ('all: add ipvX.dhcp-iaid properties') https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1447 (cherry picked from commit 941e8b70f8b187ecc3bc5bb97f1ab60aef10a452) Compared to version in main branch, the Since tags and NM_AVAILABLE_IN_* macros indicate the branched version. Backport also includes commit c7f6a506ef ('libnm: move nm_setting_ip_config_get_dhcp_iaid() to @libnm_1_40_4 version node'), it wouldn't be possible to backport both separately. --- src/libnm-client-impl/libnm.ver | 5 +++++ src/libnm-core-impl/nm-setting-ip-config.c | 2 +- src/libnm-core-public/nm-setting-ip-config.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/libnm-client-impl/libnm.ver b/src/libnm-client-impl/libnm.ver index e414b7e64d..47a015b4f4 100644 --- a/src/libnm-client-impl/libnm.ver +++ b/src/libnm-client-impl/libnm.ver @@ -1844,3 +1844,8 @@ global: nm_setting_ip4_link_local_get_type; nm_setting_ip6_config_get_mtu; } libnm_1_38_0; + +libnm_1_40_4 { +global: + nm_setting_ip_config_get_dhcp_iaid; +} libnm_1_40_0; diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c index 916a803806..ac1b8fdd5c 100644 --- a/src/libnm-core-impl/nm-setting-ip-config.c +++ b/src/libnm-core-impl/nm-setting-ip-config.c @@ -5291,7 +5291,7 @@ nm_setting_ip_config_get_required_timeout(NMSettingIPConfig *setting) * * Returns: the configured DHCP IAID (Identity Association Identifier) * - * Since: 1.22 + * Since: 1.42, 1.40.4 **/ const char * nm_setting_ip_config_get_dhcp_iaid(NMSettingIPConfig *setting) diff --git a/src/libnm-core-public/nm-setting-ip-config.h b/src/libnm-core-public/nm-setting-ip-config.h index 6283ecc948..acbdec0f61 100644 --- a/src/libnm-core-public/nm-setting-ip-config.h +++ b/src/libnm-core-public/nm-setting-ip-config.h @@ -480,7 +480,7 @@ NM_AVAILABLE_IN_1_2 int nm_setting_ip_config_get_dhcp_timeout(NMSettingIPConfig *setting); NM_AVAILABLE_IN_1_34 int nm_setting_ip_config_get_required_timeout(NMSettingIPConfig *setting); -NM_AVAILABLE_IN_1_22 +NM_AVAILABLE_IN_1_40_4 const char *nm_setting_ip_config_get_dhcp_iaid(NMSettingIPConfig *setting); NM_AVAILABLE_IN_1_22