diff options
| author | Eli Zaretskii | 2013-01-19 09:13:19 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-01-19 09:13:19 +0200 |
| commit | 6a9465f387f1933e2ff9d9258c87a44af58bd34f (patch) | |
| tree | 699b963ba606942bb330dd74c02a532f96aed680 /src | |
| parent | 9fe43ff672d02d6f43bd5bc7b08f40823c7a1851 (diff) | |
| download | emacs-6a9465f387f1933e2ff9d9258c87a44af58bd34f.tar.gz emacs-6a9465f387f1933e2ff9d9258c87a44af58bd34f.zip | |
Minor fix in acl_set_file.
src/w32.c (acl_set_file): Treat ERROR_ACCESS_DENIED from
set_file_security as failure due to insufficient privileges.
Reported by Fabrice Popineau <fabrice.popineau@supelec.fr>.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/w32.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2954df9d6b8..26773878753 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-01-19 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * w32.c (acl_set_file): Treat ERROR_ACCESS_DENIED from | ||
| 4 | set_file_security as failure due to insufficient privileges. | ||
| 5 | Reported by Fabrice Popineau <fabrice.popineau@supelec.fr>. | ||
| 6 | |||
| 1 | 2013-01-19 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2013-01-19 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 8 | ||
| 3 | Work around bug in CIFS and vboxsf file systems (Bug#13149). | 9 | Work around bug in CIFS and vboxsf file systems (Bug#13149). |
| @@ -4875,7 +4875,8 @@ acl_set_file (const char *fname, acl_type_t type, acl_t acl) | |||
| 4875 | retval = 0; | 4875 | retval = 0; |
| 4876 | errno = e; | 4876 | errno = e; |
| 4877 | } | 4877 | } |
| 4878 | else if (err == ERROR_INVALID_OWNER || err == ERROR_NOT_ALL_ASSIGNED) | 4878 | else if (err == ERROR_INVALID_OWNER || err == ERROR_NOT_ALL_ASSIGNED |
| 4879 | || err == ERROR_ACCESS_DENIED) | ||
| 4879 | { | 4880 | { |
| 4880 | /* Maybe the requested ACL and the one the file already has are | 4881 | /* Maybe the requested ACL and the one the file already has are |
| 4881 | identical, in which case we can silently ignore the | 4882 | identical, in which case we can silently ignore the |