0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

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.
This commit is contained in:
Bram Moolenaar
2013-09-08 15:40:49 +02:00
parent 3b7ac49e26
commit 3b26239341
2 changed files with 5 additions and 2 deletions

View File

@@ -1604,10 +1604,11 @@ u_read_undo(name, hash, orig_name)
#ifdef UNIX #ifdef UNIX
/* For safety we only read an undo file if the owner is equal to the /* 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 if (mch_stat((char *)orig_name, &st_orig) >= 0
&& mch_stat((char *)file_name, &st_undo) >= 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) if (p_verbose > 0)
{ {

View File

@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
24,
/**/ /**/
23, 23,
/**/ /**/