From 7e9ff09fcb2366b383b7ebbec80d2f6fff117290 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 13 Mar 2018 01:29:54 +0100 Subject: New upstream version 1.10.6 --- src/nm-policy.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/nm-policy.c') diff --git a/src/nm-policy.c b/src/nm-policy.c index 4d0ef91a..b73e04cb 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -1758,10 +1758,16 @@ device_state_changed (NMDevice *device, * been consulted, and it may be able to provide the secrets. * * We detect this by using a version-id of the agent-manager, which increments - * whenever new agents register. */ + * whenever new agents register. Note that the agent-manager's version-id is + * never zero and strictly increasing. + * + * A connection's version-id of zero means that the connection never tried to request secrets. + * That can happen when nm_settings_connection_get_secrets() fails early without actually + * consulting any agents. + */ con_v = nm_settings_connection_get_last_secret_agent_version_id (connection); if ( con_v == 0 - || con_v != nm_agent_manager_get_agent_version_id (priv->agent_mgr)) + || con_v == nm_agent_manager_get_agent_version_id (priv->agent_mgr)) block_no_secrets = TRUE; } -- cgit 1.3.0-6-gf8a5