diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-09-08 15:40:49 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-09-08 15:40:49 +0200 |
| commit | 3b262393419ddf73e0bce95e0d896c46a95236d9 (patch) | |
| tree | 84bf8ad9c3e971d2ba11a7c5426a6624805d5e82 /src | |
| parent | 3b7ac49e2672263840b5854402e7d24a7f3a8a23 (diff) | |
| download | vim-git-3b262393419ddf73e0bce95e0d896c46a95236d9.tar.gz | |
updated for version 7.4.024v7.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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/undo.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
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 @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 24, +/**/ 23, /**/ 22, |