X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=lockfile.c;h=2346e0e9ef0dbd247daf9d77c373029b491068c4;hb=7a97de4e19757b5576f32ce67d90cb792dbb893b;hp=9bc60837aa12fbe2e659ff6fb5b52e862fbe03c3;hpb=7fb23e6083dbefa8eb4c554d8b2cd5a6292b2df4;p=git.git

diff --git a/lockfile.c b/lockfile.c
index 9bc60837..2346e0e9 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -27,11 +27,16 @@ int hold_lock_file_for_update(struct lock_file *lk, const char *path)
 	int fd;
 	sprintf(lk->filename, "%s.lock", path);
 	fd = open(lk->filename, O_RDWR | O_CREAT | O_EXCL, 0666);
-	if (fd >=0 && !lk->next) {
-		lk->next = lock_file_list;
-		lock_file_list = lk;
-		signal(SIGINT, remove_lock_file_on_signal);
-		atexit(remove_lock_file);
+	if (0 <= fd) {
+		if (!lk->next) {
+			lk->next = lock_file_list;
+			lock_file_list = lk;
+			signal(SIGINT, remove_lock_file_on_signal);
+			atexit(remove_lock_file);
+		}
+		if (adjust_shared_perm(lk->filename))
+			return error("cannot fix permission bits on %s",
+				     lk->filename);
 	}
 	return fd;
 }