Merge commit 'dkg/master'

[monkeysphere.git] / src / common

diff --git a/src/common b/src/common
index 9fd156b862b3a47d1a2ea89daabbc26dbfa09511..5bb0b79fac779d08348721f2d3e5d6df0f29ed5a 100644 (file)
--- a/src/common
+++ b/src/common
@@ -445,6 +445,9 @@ update_known_hosts() {
     # least one host
     returnCode=0
 
+    # set the trap to remove any lockfiles on exit
+    trap "lockfile-remove $KNOWN_HOSTS" EXIT
+
     # create a lockfile on known_hosts
     lockfile-create "$KNOWN_HOSTS"
 
@@ -526,6 +529,9 @@ update_authorized_keys() {
     # at least one user ID
     returnCode=0
 
+    # set the trap to remove any lockfiles on exit
+    trap "lockfile-remove $AUTHORIZED_KEYS" EXIT
+
     # create a lockfile on authorized_keys
     lockfile-create "$AUTHORIZED_KEYS"