diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2011-10-21 17:43:00 +0000 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2011-10-21 17:43:00 +0000 |
commit | 22e671336e8db5fe4f026d1c0c8eb98b4e7d728f (patch) | |
tree | 6036e9ffe166f5fe287230ba2638f7e86d6a644d /winsup/cygwin/fhandler_disk_file.cc | |
parent | 2cd3283c8f3dda71b396c8921a8d23add968048f (diff) | |
download | cygnal-22e671336e8db5fe4f026d1c0c8eb98b4e7d728f.tar.gz cygnal-22e671336e8db5fe4f026d1c0c8eb98b4e7d728f.tar.bz2 cygnal-22e671336e8db5fe4f026d1c0c8eb98b4e7d728f.zip |
* fhandler_disk_file.cc (fhandler_disk_file::rmdir): Check invalid
success only on Samba shares.
* mount.cc (fs_info::update): Drop has_buggy_basic_info flag for
NcFsd.
* syscalls.cc (unlink_nt): Fix typo in comment.
Diffstat (limited to 'winsup/cygwin/fhandler_disk_file.cc')
-rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index d07cc93fb..e1ed4e18f 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -1727,7 +1727,8 @@ fhandler_disk_file::rmdir () &fbi); if (!NT_SUCCESS (status) && q_status == STATUS_OBJECT_NAME_NOT_FOUND) status = STATUS_SUCCESS; - else if (NT_SUCCESS (status) && NT_SUCCESS (q_status)) + else if (pc.fs_is_samba () + && NT_SUCCESS (status) && NT_SUCCESS (q_status)) status = STATUS_DIRECTORY_NOT_EMPTY; } if (!NT_SUCCESS (status)) |