From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 19 Jan 2013 07:13:19 +0000 (+0200)
Subject: Minor fix in acl_set_file.
X-Git-Tag: emacs-24.3.90~173^2~7^2~271
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6a9465f387f1933e2ff9d9258c87a44af58bd34f;p=emacs.git

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>.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 2954df9d6b8..26773878753 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-19  Eli Zaretskii  <eliz@gnu.org>
+
+	* 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>.
+
 2013-01-19  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Work around bug in CIFS and vboxsf file systems (Bug#13149).
diff --git a/src/w32.c b/src/w32.c
index 812003e96c0..525b0a8e89b 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -4875,7 +4875,8 @@ acl_set_file (const char *fname, acl_type_t type, acl_t acl)
       retval = 0;
       errno = e;
     }
-  else if (err == ERROR_INVALID_OWNER || err == ERROR_NOT_ALL_ASSIGNED)
+  else if (err == ERROR_INVALID_OWNER || err == ERROR_NOT_ALL_ASSIGNED
+	   || err == ERROR_ACCESS_DENIED)
     {
       /* Maybe the requested ACL and the one the file already has are
 	 identical, in which case we can silently ignore the