From bb9640f6b73cda7f769038a13006f506f23fef44 Mon Sep 17 00:00:00 2001
From: Mirek Kratochvil <exa.exa@gmail.com>
Date: Sat, 20 Apr 2013 23:43:37 +0200
Subject: [PATCH] keyring: remove race condition from unlocking

---
 src/keyring.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/keyring.cpp b/src/keyring.cpp
index d2a8d28..a66ecfa 100644
--- a/src/keyring.cpp
+++ b/src/keyring.cpp
@@ -459,10 +459,14 @@ bool keyring::close()
 	/*
 	 * close and remove the lock. Because of temporary lack of proper
 	 * reporting, we just ignore the errors now.
+	 *
+	 * Note that unlink goes first, so that the lock disappears atomically.
 	 */
-	flock (lockfd, LOCK_UN);
-	::close (lockfd);
+
 	std::string fn = get_user_dir() + LOCK_FILENAME;
 	unlink (fn.c_str() );
+
+	flock (lockfd, LOCK_UN);
+	::close (lockfd);
 	return true;
 }