From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 8 Sep 2013 13:40:49 +0000 (+0200)
Subject: updated for version 7.4.024
X-Git-Tag: v7.4.024
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b262393419ddf73e0bce95e0d896c46a95236d9;p=vim

updated for version 7.4.024
Problem:    When root edits a file the undo file is owned by root while the
            edited file may be owned by another user, which is not allowed.
            (cac2s)
Solution:   Accept an undo file owned by the current user.
---

diff --git a/src/undo.c b/src/undo.c
index 3acfad1ff..eb99294aa 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1604,10 +1604,11 @@ u_read_undo(name, hash, orig_name)
 
 #ifdef UNIX
 	/* For safety we only read an undo file if the owner is equal to the
-	 * owner of the text file. */
+	 * owner of the text file or equal to the current user. */
 	if (mch_stat((char *)orig_name, &st_orig) >= 0
 		&& mch_stat((char *)file_name, &st_undo) >= 0
-		&& st_orig.st_uid != st_undo.st_uid)
+		&& st_orig.st_uid != st_undo.st_uid
+		&& st_undo.st_uid != getuid())
 	{
 	    if (p_verbose > 0)
 	    {
diff --git a/src/version.c b/src/version.c
index 0ad2f9366..9731f70c7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    24,
 /**/
     23,
 /**/