diff options
| author | Michael Biebl <biebl@debian.org> | 2025-02-12 13:46:55 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2025-02-12 13:46:55 +0100 |
| commit | ec170f43021cdc93a65151f4646875cd3aa42a13 (patch) | |
| tree | edd6f226af21951b7b4ae1954308594413610513 /src/libnm-core-intern | |
| parent | d5d9f6796c16f29776c619f464811917e46521f4 (diff) | |
| parent | 8bdf070ff046f482f6eb5e2b15ebc216f5d1e3da (diff) | |
Update upstream source from tag 'upstream/1.51.90'
Update to upstream version '1.51.90' with Debian dir 5ed61494ac9853892cd39fb1e4debd23f234a5b9
Diffstat (limited to 'src/libnm-core-intern')
| -rw-r--r-- | src/libnm-core-intern/nm-core-internal.h | 3 | ||||
| -rw-r--r-- | src/libnm-core-intern/nm-keyfile-utils.h | 2 | ||||
| -rw-r--r-- | src/libnm-core-intern/nm-meta-setting-base-impl.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/libnm-core-intern/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h index 4677fb16..aa96c526 100644 --- a/src/libnm-core-intern/nm-core-internal.h +++ b/src/libnm-core-intern/nm-core-internal.h @@ -44,6 +44,7 @@ #include "nm-setting-ip-tunnel.h" #include "nm-setting-ip4-config.h" #include "nm-setting-ip6-config.h" +#include "nm-setting-ipvlan.h" #include "nm-setting-link.h" #include "nm-setting-loopback.h" #include "nm-setting-macsec.h" @@ -547,6 +548,8 @@ GPtrArray *_nm_setting_bridge_port_get_vlans(NMSettingBridgePort *setting); GArray *_nm_setting_connection_get_secondaries(NMSettingConnection *setting); +GArray *_nm_setting_connection_get_ip_ping_addresses(NMSettingConnection *setting); + gboolean nm_setting_connection_permissions_user_allowed_by_uid(NMSettingConnection *setting, gulong uid); diff --git a/src/libnm-core-intern/nm-keyfile-utils.h b/src/libnm-core-intern/nm-keyfile-utils.h index b7758c05..604daf51 100644 --- a/src/libnm-core-intern/nm-keyfile-utils.h +++ b/src/libnm-core-intern/nm-keyfile-utils.h @@ -88,6 +88,4 @@ const char *nm_keyfile_key_encode(const char *name, char **out_to_free); const char *nm_keyfile_key_decode(const char *key, char **out_to_free); -void nm_keyfile_add_group(GKeyFile *keyfile, const char *group); - #endif /* __NM_KEYFILE_UTILS_H__ */ diff --git a/src/libnm-core-intern/nm-meta-setting-base-impl.h b/src/libnm-core-intern/nm-meta-setting-base-impl.h index 9226183f..c03285eb 100644 --- a/src/libnm-core-intern/nm-meta-setting-base-impl.h +++ b/src/libnm-core-intern/nm-meta-setting-base-impl.h @@ -128,6 +128,7 @@ typedef enum _nm_packed { NM_META_SETTING_TYPE_IP_TUNNEL, NM_META_SETTING_TYPE_IP4_CONFIG, NM_META_SETTING_TYPE_IP6_CONFIG, + NM_META_SETTING_TYPE_IPVLAN, NM_META_SETTING_TYPE_LINK, NM_META_SETTING_TYPE_LOOPBACK, NM_META_SETTING_TYPE_MACSEC, |