diff options
| author | Michael Biebl <biebl@debian.org> | 2020-05-30 00:23:54 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-05-30 00:23:54 +0200 |
| commit | 45e8e1149027529194982212c804c0468aa01d98 (patch) | |
| tree | f3acb5e5824dd8b13f1a48bb516b0c92c5f052fd /shared | |
| parent | d460892bbfece74fb6d3cd846bf6ef548290be41 (diff) | |
New upstream version 1.24.2 upstream/1.24.2
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/nm-keyfile/nm-keyfile.c | 3 | ||||
| -rw-r--r-- | shared/nm-version-macros.h | 2 | ||||
| -rw-r--r-- | shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h | 2 |
3 files changed, 5 insertions, 2 deletions
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 |