about summary refs log tree commit diff
path: root/src/settings/plugins/keyfile/plugin.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-08-23 19:17:03 +0200
committerMichael Biebl <biebl@debian.org>2011-08-23 19:17:03 +0200
commit72acf6b5cf8cf7df57288a5ebca56cd84d21ff62 (patch)
tree45a40c078a86d4043a303ca0f81735daf263f175 /src/settings/plugins/keyfile/plugin.c
parent232698d28a1764e179f668f480738b8c7117e70a (diff)
parent263bf4c0c89bb88dc995acd9a6a2de9095fbd461 (diff)
Merge commit 'upstream/0.9.0' into experimental
Diffstat (limited to 'src/settings/plugins/keyfile/plugin.c')
-rw-r--r--src/settings/plugins/keyfile/plugin.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c
index ffc614bc..af69c200 100644
--- a/src/settings/plugins/keyfile/plugin.c
+++ b/src/settings/plugins/keyfile/plugin.c
@@ -231,7 +231,8 @@ dir_changed (GFileMonitor *monitor,
 			if (tmp) {
 				if (!nm_connection_compare (NM_CONNECTION (connection),
 				                            NM_CONNECTION (tmp),
-				                            NM_SETTING_COMPARE_FLAG_EXACT)) {
+				                            NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS |
+				                              NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS)) {
 					PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "updating %s", full_path);
 					update_connection_settings (connection, tmp);
 				}