fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-27 02:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

style: various minor adjustments

Browse source
This commit is contained in:
Thomas Haller 2022-10-25 08:41:18 +02:00
parent 61a302ff6b
commit 16c0be1ada
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/settings/nm-agent-manager.c
View file

@ -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 */

5
src/libnm-core-impl/nm-setting-8021x.c
View file

@ -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)) {