r17179: Merge the vl-posixacls tmp branch into mainline. It

[samba.git] / source3 / smbd / posix_acls.c

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index d265057ac08ab9515327e03e67e96388a0bad331..3ea442f818f9e8a297e88a275fce79ed6cdc32aa 100644 (file)
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -575,6 +575,9 @@ static void print_canon_ace(canon_ace *pace, int num)
                case SMB_ACL_OTHER:
                        dbgtext( "SMB_ACL_OTHER ");
                        break;
+               default:
+                       dbgtext( "MASK " );
+                       break;
        }
        if (pace->inherited)
                dbgtext( "(inherited) ");
@@ -2435,17 +2438,6 @@ static BOOL set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, BOOL defau
                }
        }
 
-       /*
-        * Check if the ACL is valid.
-        */
-
-       if (SMB_VFS_SYS_ACL_VALID(conn, the_acl) == -1) {
-               DEBUG(0,("set_canon_ace_list: ACL type (%s) is invalid for set (%s).\n",
-                               the_acl_type == SMB_ACL_TYPE_DEFAULT ? "directory default" : "file",
-                               strerror(errno) ));
-               goto fail;
-       }
-
        /*
         * Finally apply it to the file or directory.
         */