From 16c0be1ada2221fc48ca693da937c1586dfd2014 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 25 Oct 2022 08:41:18 +0200 Subject: [PATCH] style: various minor adjustments --- src/core/settings/nm-agent-manager.c | 2 +- src/libnm-core-impl/nm-setting-8021x.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/settings/nm-agent-manager.c b/src/core/settings/nm-agent-manager.c index 6f9268b435..0a12064936 100644 --- a/src/core/settings/nm-agent-manager.c +++ b/src/core/settings/nm-agent-manager.c @@ -1175,7 +1175,7 @@ _con_get_try_complete_early(Request *req) || (NM_FLAGS_HAS(req->con.get.flags, NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW) && !nm_connection_need_secrets_for_rerequest(tmp)) || (!NM_FLAGS_HAS(req->con.get.flags, NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW) - && nm_connection_need_secrets(tmp, NULL) == NULL)) { + && !nm_connection_need_secrets(tmp, NULL))) { _LOGD(NULL, "(" LOG_REQ_FMT ") system settings secrets sufficient", LOG_REQ_ARG(req)); /* Got everything, we're done */ diff --git a/src/libnm-core-impl/nm-setting-8021x.c b/src/libnm-core-impl/nm-setting-8021x.c index 05917c286d..be1ee41c56 100644 --- a/src/libnm-core-impl/nm-setting-8021x.c +++ b/src/libnm-core-impl/nm-setting-8021x.c @@ -2536,11 +2536,12 @@ need_secrets_tls(NMSetting8021x *self, gboolean phase2, gboolean check_rerequest) { - // If check_rerequest is TRUE do not return secrets, unless missing. - // This secret cannot be wrong. NMSetting8021xPrivate *priv = NM_SETTING_802_1X_GET_PRIVATE(self); NMSetting8021xCKScheme scheme; + /* If check_rerequest is TRUE do not return secrets, unless missing. + * This secret cannot be wrong. */ + if (!NM_FLAGS_HAS(phase2 ? priv->phase2_private_key_password_flags : priv->private_key_password_flags, NM_SETTING_SECRET_FLAG_NOT_REQUIRED)) {