summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-06-23 19:57:20 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-06-23 19:57:20 -0400
commitc6ba2bb28cf594f2a613b989fe7cd71d9550633a (patch)
tree365c09829fb589f28e880eaeb81875e62f70ff86 /src/common
parent2d56609494170affe821c54eea714de08c4db9c1 (diff)
parent9f64c356556520185325d20a8293ffa839c712bf (diff)
Merge commit 'jrollins/master'
Diffstat (limited to 'src/common')
-rw-r--r--src/common6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/common b/src/common
index 9fd156b..5bb0b79 100644
--- 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"