diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-06-23 18:07:55 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-06-23 18:09:28 +0200 |
| commit | 2b0b0375d38edd687055f84be895822801618c4a (patch) | |
| tree | acd3aab5044a9bc5950925161b591a08b6e60f53 /shared | |
| parent | 093c9db7b2a46e6042009e703e2e891abd2d2ba3 (diff) | |
| parent | 5ed4e66e01b005212aee22c255c9c6b2a4b040a9 (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
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 |