Don't try and delete a default ACL from a file.

diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 2fd047b2d07aabeaf4ac5fa2f883c375d86e0fc1..5f1c2d9b6397aa1fe4618562654a01fcdc1d6034 100644 (file)
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -3958,10 +3958,14 @@ BOOL set_unix_posix_default_acl(connection_struct *conn, const char *fname, SMB_
 {
        SMB_ACL_T def_acl = NULL;
 
-       if (num_def_acls && !S_ISDIR(psbuf->st_mode)) {
-               DEBUG(5,("set_unix_posix_default_acl: Can't set default ACL on non-directory file %s\n", fname ));
-               errno = EISDIR;
-               return False;
+       if (!S_ISDIR(psbuf->st_mode)) {
+               if (num_def_acls) {
+                       DEBUG(5,("set_unix_posix_default_acl: Can't set default ACL on non-directory file %s\n", fname ));
+                       errno = EISDIR;
+                       return false;
+               } else {
+                       return true;
+               }
        }
 
        if (!num_def_acls) {