fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 07:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: export nm_setting_ip_config_get_dhcp_iaid

Browse source 
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: 56a1a5426a ('all: add ipvX.dhcp-iaid properties')

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1447
(cherry picked from commit 941e8b70f8)

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.
This commit is contained in:
Lubomir Rintel 2022-11-02 23:30:20 +01:00
parent 310b5c66bb
commit 3c1471d9ca
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libnm-client-impl/libnm.ver
View file

@ -1844,3 +1844,8 @@ global:
nm_setting_ip4_link_local_get_type; nm_setting_ip4_link_local_get_type;
nm_setting_ip6_config_get_mtu; nm_setting_ip6_config_get_mtu;
} libnm_1_38_0; } libnm_1_38_0;
libnm_1_40_4 {
global:
nm_setting_ip_config_get_dhcp_iaid;
} libnm_1_40_0;

2
src/libnm-core-impl/nm-setting-ip-config.c
View file

@ -5291,7 +5291,7 @@ nm_setting_ip_config_get_required_timeout(NMSettingIPConfig *setting)
* *
* Returns: the configured DHCP IAID (Identity Association Identifier) * Returns: the configured DHCP IAID (Identity Association Identifier)
* *
* Since: 1.22 * Since: 1.42, 1.40.4
**/ **/
const char * const char *
nm_setting_ip_config_get_dhcp_iaid(NMSettingIPConfig *setting) nm_setting_ip_config_get_dhcp_iaid(NMSettingIPConfig *setting)

2
src/libnm-core-public/nm-setting-ip-config.h
View file

@ -480,7 +480,7 @@ NM_AVAILABLE_IN_1_2
int nm_setting_ip_config_get_dhcp_timeout(NMSettingIPConfig *setting); int nm_setting_ip_config_get_dhcp_timeout(NMSettingIPConfig *setting);
NM_AVAILABLE_IN_1_34 NM_AVAILABLE_IN_1_34
int nm_setting_ip_config_get_required_timeout(NMSettingIPConfig *setting); 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); const char *nm_setting_ip_config_get_dhcp_iaid(NMSettingIPConfig *setting);
NM_AVAILABLE_IN_1_22 NM_AVAILABLE_IN_1_22