diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2023-02-14 10:06:06 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2023-02-14 10:06:06 -0500 |
| commit | b3c2e57e153446d32d16f2d99e6abbb50146dddb (patch) | |
| tree | e71a5353ff26c7e33cbe6e482874bedc1c3cc1cd /src/libnm-core-impl/nm-setting-macsec.c | |
| parent | 1d817ebf5302c204e3ce9d3512db13bf834fee33 (diff) | |
| parent | ed857ba34efc2ec899f2e3fbd8e35324561a55b2 (diff) | |
Merge tag 'debian/1.42.0-1' into ubuntu/master
network-manager Debian release 1.42.0-1
Diffstat (limited to 'src/libnm-core-impl/nm-setting-macsec.c')
| -rw-r--r-- | src/libnm-core-impl/nm-setting-macsec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libnm-core-impl/nm-setting-macsec.c b/src/libnm-core-impl/nm-setting-macsec.c index 1463fd92..bf48f049 100644 --- a/src/libnm-core-impl/nm-setting-macsec.c +++ b/src/libnm-core-impl/nm-setting-macsec.c @@ -215,13 +215,13 @@ nm_setting_macsec_get_send_sci(NMSettingMacsec *setting) } static GPtrArray * -need_secrets(NMSetting *setting) +need_secrets(NMSetting *setting, gboolean check_rerequest) { NMSettingMacsecPrivate *priv = NM_SETTING_MACSEC_GET_PRIVATE(setting); GPtrArray *secrets = NULL; if (priv->mode == NM_SETTING_MACSEC_MODE_PSK) { - if (!priv->mka_cak + if ((check_rerequest || !priv->mka_cak) && !NM_FLAGS_HAS(priv->mka_cak_flags, NM_SETTING_SECRET_FLAG_NOT_REQUIRED)) { secrets = g_ptr_array_sized_new(1); g_ptr_array_add(secrets, NM_SETTING_MACSEC_MKA_CAK); |