Merge remote-tracking branch 'savannah/master' into HEAD

1 files changed, 7 insertions, 2 deletions

diff --git a/src/w32.c b/src/w32.c
index 38bbc496563..d4a8d2e6ffb 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -6520,7 +6520,8 @@ acl_get_file (const char *fname, acl_type_t type)
                 {
                   xfree (psd);
                   err = GetLastError ();
-                  if (err == ERROR_NOT_SUPPORTED)
+                  if (err == ERROR_NOT_SUPPORTED
+                      || err == ERROR_ACCESS_DENIED)
                     errno = ENOTSUP;
                   else if (err == ERROR_FILE_NOT_FOUND
                            || err == ERROR_PATH_NOT_FOUND
@@ -6538,7 +6539,11 @@ acl_get_file (const char *fname, acl_type_t type)
                       be encoded in the current ANSI codepage. */
                    || err == ERROR_INVALID_NAME)
             errno = ENOENT;
-          else if (err == ERROR_NOT_SUPPORTED)
+          else if (err == ERROR_NOT_SUPPORTED
+                   /* ERROR_ACCESS_DENIED is what we get for a volume
+                      mounted by WebDAV, which evidently doesn't
+                      support ACLs.  */
+                   || err == ERROR_ACCESS_DENIED)
             errno = ENOTSUP;
           else
             errno = EIO;