From d32148fd6614dc71ee9bb04518ea3c66929120fc Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 22 Sep 2020 17:54:51 +0200 Subject: [PATCH] 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') (cherry picked from commit e8e5c12480dff01f5c7fa11c9c3a6a75adb25009) (cherry picked from commit 04946f71ead4bb771bb01757b683d6212b9e181c) (cherry picked from commit 098e713ced03288765a1599890b9cac61f6a0fc5) --- libnm-core/nm-core-internal.h | 3 +++ libnm-core/nm-setting-ip-config.c | 2 -- 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 2bb18c6fd8..75afba64e0 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -448,6 +448,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 add4a4d572..10a6eb30f7 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/libnm-core/nm-setting-ip-config.c @@ -4003,8 +4003,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 ae77480c08..386b539337 100644 --- a/libnm-core/nm-setting-ip-config.h +++ b/libnm-core/nm-setting-ip-config.h @@ -454,8 +454,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,