Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest

1 files changed, 10 insertions, 0 deletions

diff --git a/clients/common/nm-client-utils.h b/clients/common/nm-client-utils.h
index 1e3085d5..28eac457 100644
--- a/clients/common/nm-client-utils.h
+++ b/clients/common/nm-client-utils.h
@@ -28,6 +28,8 @@ gboolean matches (const char *cmd, const char *pattern);
 /* FIXME: don't expose this function on its own, at least not from this file. */
 const char *nmc_bond_validate_mode (const char *mode, GError **error);
 
+const char *nmc_device_state_to_string_with_external (NMDevice *device);
+
 const char *nm_active_connection_state_reason_to_string (NMActiveConnectionStateReason reason);
 const char *nmc_device_state_to_string (NMDeviceState state);
 const char *nmc_device_reason_to_string (NMDeviceStateReason reason);
@@ -43,4 +45,12 @@ const char *nmc_password_subst_char (void);
 
 void nmc_print_qrcode (const char *str);
 
+GHashTable *nmc_utils_parse_passwd_file (char *contents,
+                                         gssize *out_error_line,
+                                         GError **error);
+
+GHashTable *nmc_utils_read_passwd_file (const char *passwd_file,
+                                        gssize *out_error_line,
+                                        GError **error);
+
 #endif /* __NM_CLIENT_UTILS_H__ */