diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-09-22 17:54:51 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-09-22 18:04:11 +0200 |
| commit | e8e5c12480dff01f5c7fa11c9c3a6a75adb25009 (patch) | |
| tree | f582ffbf6cf007e55845f2d68a82621511295e8b | |
| parent | e8dd19bb01021bf2f03f9fc0347aa3ffa82b9eec (diff) | |
| download | NetworkManager-e8e5c12480dff01f5c7fa11c9c3a6a75adb25009.tar.gz | |
libnm: hide nm_setting_ip_config_next_valid_dns_option() function from headers
nm_setting_ip_config_next_valid_dns_option() API was added in libnm 1.2, but
it was never exported in the ABI of libnm. It thus was unusable, and any user
trying to link against it would have been unable to do so.
Hide the API now entirely. It doesn't seem a very nice API. If we want to
allow the user to validate option names, we should expose such a function
to validate an option (not to fetch the next valid option from a
profile).
Fixes: 019943bb5d9e ('libnm-core: add dns-options property to NMSettingIPConfig')
| -rw-r--r-- | libnm-core/nm-core-internal.h | 3 | ||||
| -rw-r--r-- | libnm-core/nm-setting-ip-config.c | 2 | ||||
| -rw-r--r-- | libnm-core/nm-setting-ip-config.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index b31f6ba6e7..79f545446e 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -495,6 +495,9 @@ gboolean _nm_utils_dns_option_validate (const char *option, char **out_name, const NMUtilsDNSOptionDesc *option_descs); gssize _nm_utils_dns_option_find_idx (GPtrArray *array, const char *option); +int nm_setting_ip_config_next_valid_dns_option (NMSettingIPConfig *setting, + guint idx); + /*****************************************************************************/ typedef struct _NMUtilsStrStrDictKey NMUtilsStrStrDictKey; diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c index 1acfe24366..8fac0d79a5 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/libnm-core/nm-setting-ip-config.c @@ -4041,8 +4041,6 @@ nm_setting_ip_config_get_dns_option (NMSettingIPConfig *setting, guint idx) * * Returns: the index, greater or equal than @idx, of the first valid * DNS option, or -1 if no valid option is found - * - * Since: 1.2 **/ int nm_setting_ip_config_next_valid_dns_option (NMSettingIPConfig *setting, guint idx) diff --git a/libnm-core/nm-setting-ip-config.h b/libnm-core/nm-setting-ip-config.h index c621c403ea..d13c2b87d9 100644 --- a/libnm-core/nm-setting-ip-config.h +++ b/libnm-core/nm-setting-ip-config.h @@ -456,8 +456,6 @@ guint nm_setting_ip_config_get_num_dns_options (NMSettingIPConfig gboolean nm_setting_ip_config_has_dns_options (NMSettingIPConfig *setting); const char *nm_setting_ip_config_get_dns_option (NMSettingIPConfig *setting, guint idx); -int nm_setting_ip_config_next_valid_dns_option (NMSettingIPConfig *setting, - guint idx); gboolean nm_setting_ip_config_add_dns_option (NMSettingIPConfig *setting, const char *dns_option); void nm_setting_ip_config_remove_dns_option (NMSettingIPConfig *setting, |