From 45e8e1149027529194982212c804c0468aa01d98 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 30 May 2020 00:23:54 +0200 Subject: New upstream version 1.24.2 --- shared/nm-keyfile/nm-keyfile.c | 3 ++- shared/nm-version-macros.h | 2 +- shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'shared') diff --git a/shared/nm-keyfile/nm-keyfile.c b/shared/nm-keyfile/nm-keyfile.c index 879b1b00..00a61d03 100644 --- a/shared/nm-keyfile/nm-keyfile.c +++ b/shared/nm-keyfile/nm-keyfile.c @@ -3535,7 +3535,8 @@ nm_keyfile_read (GKeyFile *keyfile, vpn_secrets = TRUE; } else if (NM_STR_HAS_PREFIX (groups[i], NM_KEYFILE_GROUPPREFIX_WIREGUARD_PEER)) _read_setting_wireguard_peer (&info); - else if (nm_streq (groups[i], NM_KEYFILE_GROUP_NMMETA)) { + else if (NM_IN_STRSET (groups[i], NM_KEYFILE_GROUP_NMMETA, + ETHERNET_S390_OPTIONS_GROUP_NAME)) { /* pass */ } else _read_setting (&info); diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index b98a4e1d..4858a066 100644 --- a/shared/nm-version-macros.h +++ b/shared/nm-version-macros.h @@ -30,7 +30,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (0) +#define NM_MICRO_VERSION (2) /** * NM_CHECK_VERSION: diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h index 26a043f5..e2378c5b 100644 --- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h +++ b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h @@ -70,7 +70,9 @@ G_STMT_START { \ /*****************************************************************************/ +#ifndef VALGRIND #define VALGRIND 0 +#endif #define ENABLE_DEBUG_HASHMAP 0 -- cgit 1.3.0-6-gf8a5