diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-06-10 11:28:44 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-06-10 11:37:39 +0200 |
| commit | ccc1be34ee39731ee37f869fac8280971c69a17f (patch) | |
| tree | 239f8c343bb527d26cd1296991cb4c4874e0f50c | |
| parent | 4e6f466fd3ba294c78827917a544bbab1878466d (diff) | |
| download | NetworkManager-ccc1be34ee39731ee37f869fac8280971c69a17f.tar.gz | |
libnm: backport symbols nm_setting_ip_config_get_dns_priority to libnm_1_2_4
Commit bdd0e7fec0a2af12331b815bfaf3de182ed6eebb which added symbol
nm_setting_ip_config_get_dns_priority to libnm_1_4_0 was backported
to nm-1-2 in commit ad1cdcf6571da23e3197b09f1b4b14d23b8899d1.
Add the backported symbol to master to allow seemless upgrading
from 1.2.4 to 1.4.0.
| -rw-r--r-- | libnm-core/nm-setting-ip-config.c | 1 | ||||
| -rw-r--r-- | libnm/libnm.ver | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c index c7e9b5fe4a..0b97b07482 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/libnm-core/nm-setting-ip-config.c @@ -1700,6 +1700,7 @@ nm_setting_ip_config_get_dns_priority (NMSettingIPConfig *setting) return NM_SETTING_IP_CONFIG_GET_PRIVATE (setting)->dns_priority; } +NM_BACKPORT_SYMBOL (libnm_1_2_4, gint, nm_setting_ip_config_get_dns_priority, (NMSettingIPConfig *setting), (setting)); /** * nm_setting_ip_config_get_num_addresses: diff --git a/libnm/libnm.ver b/libnm/libnm.ver index 19b00210ef..4bdef30186 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -1059,6 +1059,10 @@ global: nm_vpn_service_plugin_set_login_banner; } libnm_1_0_0; +libnm_1_2_4 { + #nm_setting_ip_config_get_dns_priority@libnm_1_2_4; +} libnm_1_2_0; + libnm_1_4_0 { global: nm_device_team_get_config; |