diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
| commit | e83d1de9b746dbc078ac1cf45f1798e1bc6b7e2f (patch) | |
| tree | c36a40d79a5ae7d2bbca7d240d0a6f664049b435 /src/settings/plugins/keyfile/utils.c | |
| parent | 26283b4c9e5035574a6c168003e7f1da53a8f32a (diff) | |
| parent | a4256940da049f91bbbea5e53e469a59ea9c10f7 (diff) | |
Merge tag 'upstream/0.9.8.8' into experimental
Upstream version 0.9.8.8
Diffstat (limited to 'src/settings/plugins/keyfile/utils.c')
| -rw-r--r-- | src/settings/plugins/keyfile/utils.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/settings/plugins/keyfile/utils.c b/src/settings/plugins/keyfile/utils.c index f3531172..8db5d524 100644 --- a/src/settings/plugins/keyfile/utils.c +++ b/src/settings/plugins/keyfile/utils.c @@ -96,6 +96,7 @@ nm_keyfile_plugin_utils_should_ignore_file (const char *filename) || check_suffix (base, PEM_TAG) /* 802.1x certificates and keys */ || check_suffix (base, DER_TAG) /* 802.1x certificates and keys */ || check_mkstemp_suffix (base) /* temporary files created by mkstemp() */ + || check_prefix (base, ".#") /* Emacs locking file (link) */ || base[strlen (base) - 1] == '~') ignore = TRUE; |