Update to upstream version '1.35.90

1 files changed, 14 insertions, 9 deletions

diff --git a/src/libnm-core-impl/nm-utils-private.h b/src/libnm-core-impl/nm-utils-private.h
index 679fd6b4..1a6f29ef 100644
--- a/src/libnm-core-impl/nm-utils-private.h
+++ b/src/libnm-core-impl/nm-utils-private.h
@@ -19,16 +19,16 @@
 gboolean _nm_utils_string_slist_validate(GSList *list, const char **valid_values);
 
 gboolean _nm_utils_secret_flags_validate(NMSettingSecretFlags secret_flags,
-                                         const char *         setting_name,
-                                         const char *         property_name,
+                                         const char          *setting_name,
+                                         const char          *property_name,
                                          NMSettingSecretFlags disallowed_flags,
-                                         GError **            error);
+                                         GError             **error);
 
 gboolean _nm_utils_wps_method_validate(NMSettingWirelessSecurityWpsMethod wps_method,
-                                       const char *                       setting_name,
-                                       const char *                       property_name,
+                                       const char                        *setting_name,
+                                       const char                        *property_name,
                                        gboolean                           wps_required,
-                                       GError **                          error);
+                                       GError                           **error);
 
 /* D-Bus transform funcs */
 
@@ -44,15 +44,16 @@ void _nm_utils_bytes_from_dbus(GVariant *dbus_value, GValue *prop_value);
 
 char *_nm_utils_hwaddr_canonical_or_invalid(const char *mac, gssize length);
 
-char *_nm_utils_ipaddr_canonical_or_invalid(int addr_family, const char *ip);
+char *
+_nm_utils_ipaddr_canonical_or_invalid(int addr_family, const char *ip, gboolean map_zero_to_null);
 
 gboolean _nm_utils_hwaddr_link_local_valid(const char *mac);
 
 gboolean _nm_sriov_vf_parse_vlans(NMSriovVF *vf, const char *str, GError **error);
 
-gboolean _nm_utils_bridge_vlan_verify_list(GPtrArray * vlans,
+gboolean _nm_utils_bridge_vlan_verify_list(GPtrArray  *vlans,
                                            gboolean    check_normalizable,
-                                           GError **   error,
+                                           GError    **error,
                                            const char *setting,
                                            const char *property);
 
@@ -66,4 +67,8 @@ void _nm_team_settings_property_from_dbus_link_watchers(
 GVariant *_nm_utils_ip4_dns_to_variant(const char *const *dns, gssize len);
 GVariant *_nm_utils_ip6_dns_to_variant(const char *const *dns, gssize len);
 
+const char *const *nmtst_system_encodings_for_lang(const char *lang);
+const char *const *nmtst_system_encodings_get_default(void);
+const char *const *nmtst_system_encodings_get(void);
+
 #endif