mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-27 10:10:25 +01:00
merge: branch 'bg/safe-file-access-syms-main'
This commit is contained in:
commit
e776f80197
2 changed files with 34 additions and 0 deletions
|
|
@ -2064,6 +2064,11 @@ global:
|
|||
nm_ethtool_optname_is_fec;
|
||||
} libnm_1_50_0;
|
||||
|
||||
libnm_1_52_2 {
|
||||
#nm_utils_copy_cert_as_user@libnm_1_52_2;
|
||||
#nm_vpn_plugin_info_supports_safe_private_file_access@libnm_1_52_2;
|
||||
} libnm_1_52_0;
|
||||
|
||||
libnm_1_54_0 {
|
||||
global:
|
||||
nm_setting_ip_config_forwarding_get_type;
|
||||
|
|
@ -2084,6 +2089,11 @@ global:
|
|||
nm_setting_hsr_protocol_version_get_type;
|
||||
} libnm_1_54_0;
|
||||
|
||||
libnm_1_54_3 {
|
||||
#nm_utils_copy_cert_as_user@libnm_1_54_3;
|
||||
#nm_vpn_plugin_info_supports_safe_private_file_access@libnm_1_54_3;
|
||||
} libnm_1_54_2;
|
||||
|
||||
libnm_1_56_0 {
|
||||
global:
|
||||
nm_dns_server_validate;
|
||||
|
|
|
|||
|
|
@ -9339,3 +9339,27 @@ NM_BACKPORT_SYMBOL(libnm_1_50_4,
|
|||
(optname));
|
||||
|
||||
NM_BACKPORT_SYMBOL(libnm_1_50_4, GType, nm_setting_ethtool_fec_mode_get_type, (void), ());
|
||||
|
||||
NM_BACKPORT_SYMBOL(libnm_1_52_2,
|
||||
char *,
|
||||
nm_utils_copy_cert_as_user,
|
||||
(const char *filename, const char *user, GError **error),
|
||||
(filename, user, error));
|
||||
|
||||
NM_BACKPORT_SYMBOL(libnm_1_52_2,
|
||||
gboolean,
|
||||
nm_vpn_plugin_info_supports_safe_private_file_access,
|
||||
(NMVpnPluginInfo * self),
|
||||
(self));
|
||||
|
||||
NM_BACKPORT_SYMBOL(libnm_1_54_3,
|
||||
char *,
|
||||
nm_utils_copy_cert_as_user,
|
||||
(const char *filename, const char *user, GError **error),
|
||||
(filename, user, error));
|
||||
|
||||
NM_BACKPORT_SYMBOL(libnm_1_54_3,
|
||||
gboolean,
|
||||
nm_vpn_plugin_info_supports_safe_private_file_access,
|
||||
(NMVpnPluginInfo * self),
|
||||
(self));
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue