r4596: added a dynamic inheritance ACLs test. As far as I can tell w2k3 does not do
[samba.git] / source / torture / raw / acls.c
index 84d2238a9e986176463ce31c642fbf80d16beca6..97f5f4f5e1f901deb3bb2a1a7db6b261446ed911 100644 (file)
@@ -41,7 +41,7 @@ static BOOL test_sd(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        union smb_open io;
        const char *fname = BASEDIR "\\sd.txt";
        BOOL ret = True;
-       int fnum;
+       int fnum = -1;
        union smb_fileinfo q;
        union smb_setfileinfo set;
        struct security_ace ace;
@@ -101,12 +101,13 @@ static BOOL test_sd(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        status = smb_raw_fileinfo(cli->tree, mem_ctx, &q);
        CHECK_STATUS(status, NT_STATUS_OK);
 
-       if (!security_descriptor_equal(q.query_secdesc.out.sd, sd)) {
-               printf("security descriptors don't match!\n");
+       if (!security_acl_equal(q.query_secdesc.out.sd->dacl, sd->dacl)) {
+               printf("%s: security descriptors don't match!\n", __location__);
                printf("got:\n");
                NDR_PRINT_DEBUG(security_descriptor, q.query_secdesc.out.sd);
                printf("expected:\n");
                NDR_PRINT_DEBUG(security_descriptor, sd);
+               ret = False;
        }
 
        printf("remove it again\n");
@@ -120,12 +121,13 @@ static BOOL test_sd(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        status = smb_raw_fileinfo(cli->tree, mem_ctx, &q);
        CHECK_STATUS(status, NT_STATUS_OK);
 
-       if (!security_descriptor_equal(q.query_secdesc.out.sd, sd)) {
-               printf("security descriptors don't match!\n");
+       if (!security_acl_equal(q.query_secdesc.out.sd->dacl, sd->dacl)) {
+               printf("%s: security descriptors don't match!\n", __location__);
                printf("got:\n");
                NDR_PRINT_DEBUG(security_descriptor, q.query_secdesc.out.sd);
                printf("expected:\n");
                NDR_PRINT_DEBUG(security_descriptor, sd);
+               ret = False;
        }
 
 done:
@@ -211,12 +213,13 @@ static BOOL test_nttrans_create(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        status = smb_raw_fileinfo(cli->tree, mem_ctx, &q);
        CHECK_STATUS(status, NT_STATUS_OK);
 
-       if (!security_descriptor_equal(q.query_secdesc.out.sd, sd)) {
-               printf("security descriptors don't match!\n");
+       if (!security_acl_equal(q.query_secdesc.out.sd->dacl, sd->dacl)) {
+               printf("%s: security descriptors don't match!\n", __location__);
                printf("got:\n");
                NDR_PRINT_DEBUG(security_descriptor, q.query_secdesc.out.sd);
                printf("expected:\n");
                NDR_PRINT_DEBUG(security_descriptor, sd);
+               ret = False;
        }
 
 done:
@@ -249,7 +252,7 @@ static BOOL test_creator_sid(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        union smb_open io;
        const char *fname = BASEDIR "\\creator.txt";
        BOOL ret = True;
-       int fnum;
+       int fnum = -1;
        union smb_fileinfo q;
        union smb_setfileinfo set;
        struct security_descriptor *sd, *sd_orig, *sd2;
@@ -260,7 +263,7 @@ static BOOL test_creator_sid(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        io.generic.level = RAW_OPEN_NTCREATEX;
        io.ntcreatex.in.root_fid = 0;
        io.ntcreatex.in.flags = 0;
-       io.ntcreatex.in.access_mask = SEC_STD_READ_CONTROL | SEC_STD_WRITE_DAC;
+       io.ntcreatex.in.access_mask = SEC_STD_READ_CONTROL | SEC_STD_WRITE_DAC | SEC_STD_WRITE_OWNER;
        io.ntcreatex.in.create_options = 0;
        io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
        io.ntcreatex.in.share_access = 
@@ -291,6 +294,7 @@ static BOOL test_creator_sid(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
                                        SID_CREATOR_OWNER,
                                        SEC_ACE_TYPE_ACCESS_ALLOWED,
                                        SEC_RIGHTS_FILE_READ | SEC_STD_ALL,
+                                       0,
                                        NULL);
 
        set.set_secdesc.level = RAW_SFILEINFO_SEC_DESC;
@@ -323,16 +327,32 @@ static BOOL test_creator_sid(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 
        printf("set a sec desc allowing no write by owner\n");
        sd = security_descriptor_create(mem_ctx,
-                                       NULL, NULL,
+                                       owner_sid, NULL,
                                        owner_sid,
                                        SEC_ACE_TYPE_ACCESS_ALLOWED,
                                        SEC_RIGHTS_FILE_READ | SEC_STD_ALL,
+                                       0,
                                        NULL);
 
+       set.set_secdesc.level = RAW_SFILEINFO_SEC_DESC;
+       set.set_secdesc.file.fnum = fnum;
+       set.set_secdesc.in.secinfo_flags = SECINFO_DACL;
        set.set_secdesc.in.sd = sd;
        status = smb_raw_setfileinfo(cli->tree, &set);
        CHECK_STATUS(status, NT_STATUS_OK);
 
+       printf("check that sd has been mapped correctly\n");
+       status = smb_raw_fileinfo(cli->tree, mem_ctx, &q);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       if (!security_descriptor_equal(q.query_secdesc.out.sd, sd)) {
+               printf("%s: security descriptors don't match!\n", __location__);
+               printf("got:\n");
+               NDR_PRINT_DEBUG(security_descriptor, q.query_secdesc.out.sd);
+               printf("expected:\n");
+               NDR_PRINT_DEBUG(security_descriptor, sd);
+               ret = False;
+       }
+
        printf("try open for write\n");
        io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA;
        status = smb_raw_open(cli->tree, mem_ctx, &io);
@@ -366,6 +386,7 @@ static BOOL test_creator_sid(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
                                        owner_sid,
                                        SEC_ACE_TYPE_ACCESS_ALLOWED,
                                        SEC_GENERIC_READ | SEC_STD_ALL,
+                                       0,
                                        NULL);
 
        set.set_secdesc.in.sd = sd;
@@ -378,16 +399,18 @@ static BOOL test_creator_sid(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
                                         owner_sid,
                                         SEC_ACE_TYPE_ACCESS_ALLOWED,
                                         SEC_RIGHTS_FILE_READ | SEC_STD_ALL,
+                                        0,
                                         NULL);
 
        status = smb_raw_fileinfo(cli->tree, mem_ctx, &q);
        CHECK_STATUS(status, NT_STATUS_OK);
        if (!security_descriptor_equal(q.query_secdesc.out.sd, sd2)) {
-               printf("security descriptors don't match!\n");
+               printf("%s: security descriptors don't match!\n", __location__);
                printf("got:\n");
                NDR_PRINT_DEBUG(security_descriptor, q.query_secdesc.out.sd);
                printf("expected:\n");
                NDR_PRINT_DEBUG(security_descriptor, sd2);
+               ret = False;
        }
        
 
@@ -440,7 +463,7 @@ static BOOL test_generic_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        union smb_open io;
        const char *fname = BASEDIR "\\generic.txt";
        BOOL ret = True;
-       int fnum, i;
+       int fnum = -1, i;
        union smb_fileinfo q;
        union smb_setfileinfo set;
        struct security_descriptor *sd, *sd_orig, *sd2;
@@ -449,11 +472,13 @@ static BOOL test_generic_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
                uint32_t gen_bits;
                uint32_t specific_bits;
        } file_mappings[] = {
-               { 0,                   0 },
-               { SEC_GENERIC_READ,    SEC_RIGHTS_FILE_READ },
-               { SEC_GENERIC_WRITE,   SEC_RIGHTS_FILE_WRITE },
-               { SEC_GENERIC_EXECUTE, SEC_RIGHTS_FILE_EXECUTE },
-               { SEC_GENERIC_ALL,     SEC_RIGHTS_FILE_ALL }
+               { 0,                       0 },
+               { SEC_GENERIC_READ,        SEC_RIGHTS_FILE_READ },
+               { SEC_GENERIC_WRITE,       SEC_RIGHTS_FILE_WRITE },
+               { SEC_GENERIC_EXECUTE,     SEC_RIGHTS_FILE_EXECUTE },
+               { SEC_GENERIC_ALL,         SEC_RIGHTS_FILE_ALL },
+               { SEC_FILE_READ_DATA,      SEC_FILE_READ_DATA },
+               { SEC_FILE_READ_ATTRIBUTE, SEC_FILE_READ_ATTRIBUTE }
        };
        const struct {
                uint32_t gen_bits;
@@ -465,13 +490,18 @@ static BOOL test_generic_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
                { SEC_GENERIC_EXECUTE, SEC_RIGHTS_DIR_EXECUTE },
                { SEC_GENERIC_ALL,     SEC_RIGHTS_DIR_ALL }
        };
+       BOOL has_restore_privilege;
+       BOOL has_take_ownership_privilege;
 
        printf("TESTING FILE GENERIC BITS\n");
 
        io.generic.level = RAW_OPEN_NTCREATEX;
        io.ntcreatex.in.root_fid = 0;
        io.ntcreatex.in.flags = 0;
-       io.ntcreatex.in.access_mask = SEC_STD_READ_CONTROL | SEC_STD_WRITE_DAC;
+       io.ntcreatex.in.access_mask = 
+               SEC_STD_READ_CONTROL | 
+               SEC_STD_WRITE_DAC | 
+               SEC_STD_WRITE_OWNER;
        io.ntcreatex.in.create_options = 0;
        io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
        io.ntcreatex.in.share_access = 
@@ -496,21 +526,49 @@ static BOOL test_generic_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 
        owner_sid = dom_sid_string(mem_ctx, sd_orig->owner_sid);
 
+       status = smblsa_sid_check_privilege(cli, 
+                                           owner_sid, 
+                                           sec_privilege_name(SEC_PRIV_RESTORE));
+       has_restore_privilege = NT_STATUS_IS_OK(status);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smblsa_sid_check_privilege - %s\n", nt_errstr(status));
+       }
+       printf("SEC_PRIV_RESTORE - %s\n", has_restore_privilege?"Yes":"No");
+
+       status = smblsa_sid_check_privilege(cli, 
+                                           owner_sid, 
+                                           sec_privilege_name(SEC_PRIV_TAKE_OWNERSHIP));
+       has_take_ownership_privilege = NT_STATUS_IS_OK(status);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smblsa_sid_check_privilege - %s\n", nt_errstr(status));
+       }
+       printf("SEC_PRIV_TAKE_OWNERSHIP - %s\n", has_restore_privilege?"Yes":"No");
 
        for (i=0;i<ARRAY_SIZE(file_mappings);i++) {
+               uint32_t expected_mask = 
+                       SEC_STD_WRITE_DAC | 
+                       SEC_STD_READ_CONTROL | 
+                       SEC_FILE_READ_ATTRIBUTE |
+                       SEC_STD_DELETE;
+               uint32_t expected_mask_anon = SEC_FILE_READ_ATTRIBUTE;
+
+               if (has_restore_privilege) {
+                       expected_mask_anon |= SEC_STD_DELETE;
+               }
 
                printf("testing generic bits 0x%08x\n", 
                       file_mappings[i].gen_bits);
                sd = security_descriptor_create(mem_ctx,
-                                               NULL, NULL,
+                                               owner_sid, NULL,
                                                owner_sid,
                                                SEC_ACE_TYPE_ACCESS_ALLOWED,
                                                file_mappings[i].gen_bits,
+                                               0,
                                                NULL);
 
                set.set_secdesc.level = RAW_SFILEINFO_SEC_DESC;
                set.set_secdesc.file.fnum = fnum;
-               set.set_secdesc.in.secinfo_flags = SECINFO_DACL;
+               set.set_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER;
                set.set_secdesc.in.sd = sd;
 
                status = smb_raw_setfileinfo(cli->tree, &set);
@@ -521,29 +579,74 @@ static BOOL test_generic_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
                                                 owner_sid,
                                                 SEC_ACE_TYPE_ACCESS_ALLOWED,
                                                 file_mappings[i].specific_bits,
+                                                0,
                                                 NULL);
 
                status = smb_raw_fileinfo(cli->tree, mem_ctx, &q);
                CHECK_STATUS(status, NT_STATUS_OK);
                if (!security_descriptor_equal(q.query_secdesc.out.sd, sd2)) {
-                       printf("security descriptors don't match!\n");
+                       printf("%s: security descriptors don't match!\n", __location__);
                        printf("got:\n");
                        NDR_PRINT_DEBUG(security_descriptor, q.query_secdesc.out.sd);
                        printf("expected:\n");
                        NDR_PRINT_DEBUG(security_descriptor, sd2);
+                       ret = False;
                }
 
                io.ntcreatex.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
                status = smb_raw_open(cli->tree, mem_ctx, &io);
                CHECK_STATUS(status, NT_STATUS_OK);
                CHECK_ACCESS_FLAGS(io.ntcreatex.out.fnum, 
-                                  SEC_STD_WRITE_DAC | 
-                                  SEC_STD_READ_CONTROL | 
-                                  SEC_STD_DELETE | 
-                                  SEC_FILE_READ_ATTRIBUTE |
-                                  file_mappings[i].specific_bits);
+                                  expected_mask | file_mappings[i].specific_bits);
                smbcli_close(cli->tree, io.ntcreatex.out.fnum);
 
+               if (!has_take_ownership_privilege) {
+                       continue;
+               }
+
+               printf("testing generic bits 0x%08x (anonymous)\n", 
+                      file_mappings[i].gen_bits);
+               sd = security_descriptor_create(mem_ctx,
+                                               SID_NT_ANONYMOUS, NULL,
+                                               owner_sid,
+                                               SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                               file_mappings[i].gen_bits,
+                                               0,
+                                               NULL);
+
+               set.set_secdesc.level = RAW_SFILEINFO_SEC_DESC;
+               set.set_secdesc.file.fnum = fnum;
+               set.set_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER;
+               set.set_secdesc.in.sd = sd;
+
+               status = smb_raw_setfileinfo(cli->tree, &set);
+               CHECK_STATUS(status, NT_STATUS_OK);
+
+               sd2 = security_descriptor_create(mem_ctx,
+                                                SID_NT_ANONYMOUS, NULL,
+                                                owner_sid,
+                                                SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                                file_mappings[i].specific_bits,
+                                                0,
+                                                NULL);
+
+               status = smb_raw_fileinfo(cli->tree, mem_ctx, &q);
+               CHECK_STATUS(status, NT_STATUS_OK);
+               if (!security_descriptor_equal(q.query_secdesc.out.sd, sd2)) {
+                       printf("%s: security descriptors don't match!\n", __location__);
+                       printf("got:\n");
+                       NDR_PRINT_DEBUG(security_descriptor, q.query_secdesc.out.sd);
+                       printf("expected:\n");
+                       NDR_PRINT_DEBUG(security_descriptor, sd2);
+                       ret = False;
+               }
+
+               io.ntcreatex.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+               status = smb_raw_open(cli->tree, mem_ctx, &io);
+               CHECK_STATUS(status, NT_STATUS_OK);
+               CHECK_ACCESS_FLAGS(io.ntcreatex.out.fnum, 
+                                  expected_mask_anon | file_mappings[i].specific_bits);
+               smbcli_close(cli->tree, io.ntcreatex.out.fnum);
        }
 
        printf("put back original sd\n");
@@ -586,7 +689,12 @@ static BOOL test_generic_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        owner_sid = dom_sid_string(mem_ctx, sd_orig->owner_sid);
 
 
-       for (i=0;i<ARRAY_SIZE(file_mappings);i++) {
+       for (i=0;i<ARRAY_SIZE(dir_mappings);i++) {
+               uint32_t expected_mask = 
+                       SEC_STD_WRITE_DAC | 
+                       SEC_STD_READ_CONTROL | 
+                       SEC_FILE_READ_ATTRIBUTE |
+                       SEC_STD_DELETE;
 
                printf("testing generic bits 0x%08x\n", 
                       file_mappings[i].gen_bits);
@@ -595,6 +703,7 @@ static BOOL test_generic_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
                                                owner_sid,
                                                SEC_ACE_TYPE_ACCESS_ALLOWED,
                                                dir_mappings[i].gen_bits,
+                                               0,
                                                NULL);
 
                set.set_secdesc.level = RAW_SFILEINFO_SEC_DESC;
@@ -610,44 +719,686 @@ static BOOL test_generic_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
                                                 owner_sid,
                                                 SEC_ACE_TYPE_ACCESS_ALLOWED,
                                                 dir_mappings[i].specific_bits,
+                                                0,
                                                 NULL);
 
                status = smb_raw_fileinfo(cli->tree, mem_ctx, &q);
                CHECK_STATUS(status, NT_STATUS_OK);
                if (!security_descriptor_equal(q.query_secdesc.out.sd, sd2)) {
-                       printf("security descriptors don't match!\n");
+                       printf("%s: security descriptors don't match!\n", __location__);
                        printf("got:\n");
                        NDR_PRINT_DEBUG(security_descriptor, q.query_secdesc.out.sd);
                        printf("expected:\n");
                        NDR_PRINT_DEBUG(security_descriptor, sd2);
+                       ret = False;
                }
 
                io.ntcreatex.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
                status = smb_raw_open(cli->tree, mem_ctx, &io);
                CHECK_STATUS(status, NT_STATUS_OK);
                CHECK_ACCESS_FLAGS(io.ntcreatex.out.fnum, 
-                                  SEC_STD_WRITE_DAC | 
-                                  SEC_STD_READ_CONTROL | 
-                                  SEC_STD_DELETE | 
-                                  SEC_FILE_READ_ATTRIBUTE |
-                                  dir_mappings[i].specific_bits);
+                                  expected_mask | dir_mappings[i].specific_bits);
                smbcli_close(cli->tree, io.ntcreatex.out.fnum);
+       }
+
+       printf("put back original sd\n");
+       set.set_secdesc.in.sd = sd_orig;
+       status = smb_raw_setfileinfo(cli->tree, &set);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
+
+done:
+       smbcli_close(cli->tree, fnum);
+       return ret;
+}
+
+
+/*
+  see what access bits the owner of a file always gets
+*/
+static BOOL test_owner_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
+{
+       NTSTATUS status;
+       union smb_open io;
+       const char *fname = BASEDIR "\\generic.txt";
+       BOOL ret = True;
+       int fnum = -1, i;
+       union smb_fileinfo q;
+       union smb_setfileinfo set;
+       struct security_descriptor *sd, *sd_orig;
+       const char *owner_sid;
+       BOOL has_restore_privilege;
+       BOOL has_take_ownership_privilege;
+       uint32_t expected_bits;
+
+       printf("TESTING FILE OWNER BITS\n");
+
+       io.generic.level = RAW_OPEN_NTCREATEX;
+       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.flags = 0;
+       io.ntcreatex.in.access_mask = 
+               SEC_STD_READ_CONTROL | 
+               SEC_STD_WRITE_DAC | 
+               SEC_STD_WRITE_OWNER;
+       io.ntcreatex.in.create_options = 0;
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
+       io.ntcreatex.in.share_access = 
+               NTCREATEX_SHARE_ACCESS_READ | 
+               NTCREATEX_SHARE_ACCESS_WRITE;
+       io.ntcreatex.in.alloc_size = 0;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN_IF;
+       io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
+       io.ntcreatex.in.security_flags = 0;
+       io.ntcreatex.in.fname = fname;
+       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       fnum = io.ntcreatex.out.fnum;
+
+       printf("get the original sd\n");
+       q.query_secdesc.level = RAW_FILEINFO_SEC_DESC;
+       q.query_secdesc.in.fnum = fnum;
+       q.query_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER;
+       status = smb_raw_fileinfo(cli->tree, mem_ctx, &q);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       sd_orig = q.query_secdesc.out.sd;
 
+       owner_sid = dom_sid_string(mem_ctx, sd_orig->owner_sid);
+
+       status = smblsa_sid_check_privilege(cli, 
+                                           owner_sid, 
+                                           sec_privilege_name(SEC_PRIV_RESTORE));
+       has_restore_privilege = NT_STATUS_IS_OK(status);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smblsa_sid_check_privilege - %s\n", nt_errstr(status));
+       }
+       printf("SEC_PRIV_RESTORE - %s\n", has_restore_privilege?"Yes":"No");
+
+       status = smblsa_sid_check_privilege(cli, 
+                                           owner_sid, 
+                                           sec_privilege_name(SEC_PRIV_TAKE_OWNERSHIP));
+       has_take_ownership_privilege = NT_STATUS_IS_OK(status);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smblsa_sid_check_privilege - %s\n", nt_errstr(status));
        }
+       printf("SEC_PRIV_TAKE_OWNERSHIP - %s\n", has_restore_privilege?"Yes":"No");
+
+       sd = security_descriptor_create(mem_ctx,
+                                       NULL, NULL,
+                                       owner_sid,
+                                       SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                       SEC_FILE_WRITE_DATA,
+                                       0,
+                                       NULL);
+
+       set.set_secdesc.level = RAW_SFILEINFO_SEC_DESC;
+       set.set_secdesc.file.fnum = fnum;
+       set.set_secdesc.in.secinfo_flags = SECINFO_DACL;
+       set.set_secdesc.in.sd = sd;
+
+       status = smb_raw_setfileinfo(cli->tree, &set);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       expected_bits = SEC_FILE_WRITE_DATA | SEC_FILE_READ_ATTRIBUTE;
+
+       for (i=0;i<16;i++) {
+               uint32 bit = (1<<i);
+               io.ntcreatex.in.access_mask = bit;
+               status = smb_raw_open(cli->tree, mem_ctx, &io);
+               if (expected_bits & bit) {
+                       if (!NT_STATUS_IS_OK(status)) {
+                               printf("failed with access mask 0x%08x of expected 0x%08x\n",
+                                      bit, expected_bits);
+                       }
+                       CHECK_STATUS(status, NT_STATUS_OK);
+                       CHECK_ACCESS_FLAGS(io.ntcreatex.out.fnum, bit | SEC_FILE_READ_ATTRIBUTE);
+                       smbcli_close(cli->tree, io.ntcreatex.out.fnum);
+               } else {
+                       CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED);
+               }
+       }
+
        printf("put back original sd\n");
        set.set_secdesc.in.sd = sd_orig;
        status = smb_raw_setfileinfo(cli->tree, &set);
        CHECK_STATUS(status, NT_STATUS_OK);
 
+done:
        smbcli_close(cli->tree, fnum);
        smbcli_unlink(cli->tree, fname);
+       return ret;
+}
+
+
+
+/*
+  test the inheritance of ACL flags onto new files and directories
+*/
+static BOOL test_inheritance(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
+{
+       NTSTATUS status;
+       union smb_open io;
+       const char *dname = BASEDIR "\\inheritance";
+       const char *fname1 = BASEDIR "\\inheritance\\testfile";
+       const char *fname2 = BASEDIR "\\inheritance\\testdir";
+       BOOL ret = True;
+       int fnum, fnum2, i;
+       union smb_fileinfo q;
+       union smb_setfileinfo set;
+       struct security_descriptor *sd, *sd_orig, *sd_def;
+       const char *owner_sid;
+       const struct dom_sid *creator_owner;
+       const struct {
+               uint32_t parent_flags;
+               uint32_t file_flags;
+               uint32_t dir_flags;
+       } test_flags[] = {
+               {
+                       0, 
+                       0,
+                       0
+               },
+               {
+                       SEC_ACE_FLAG_OBJECT_INHERIT,
+                       0,
+                       SEC_ACE_FLAG_OBJECT_INHERIT | 
+                       SEC_ACE_FLAG_INHERIT_ONLY,
+               },
+               {
+                       SEC_ACE_FLAG_CONTAINER_INHERIT,
+                       0,
+                       SEC_ACE_FLAG_CONTAINER_INHERIT,
+               },
+               {
+                       SEC_ACE_FLAG_OBJECT_INHERIT | 
+                       SEC_ACE_FLAG_CONTAINER_INHERIT,
+                       0,
+                       SEC_ACE_FLAG_OBJECT_INHERIT | 
+                       SEC_ACE_FLAG_CONTAINER_INHERIT,
+               },
+               {
+                       SEC_ACE_FLAG_NO_PROPAGATE_INHERIT,
+                       0,
+                       0,
+               },
+               {
+                       SEC_ACE_FLAG_NO_PROPAGATE_INHERIT | 
+                       SEC_ACE_FLAG_OBJECT_INHERIT,
+                       0,
+                       0,
+               },
+               {
+                       SEC_ACE_FLAG_NO_PROPAGATE_INHERIT | 
+                       SEC_ACE_FLAG_CONTAINER_INHERIT,
+                       0,
+                       0,
+               },
+               {
+                       SEC_ACE_FLAG_NO_PROPAGATE_INHERIT | 
+                       SEC_ACE_FLAG_CONTAINER_INHERIT | 
+                       SEC_ACE_FLAG_OBJECT_INHERIT,
+                       0,
+                       0,
+               },
+               {
+                       SEC_ACE_FLAG_INHERIT_ONLY,
+                       0,
+                       0,
+               },
+               {
+                       SEC_ACE_FLAG_INHERIT_ONLY | 
+                       SEC_ACE_FLAG_OBJECT_INHERIT,
+                       0,
+                       SEC_ACE_FLAG_OBJECT_INHERIT | 
+                       SEC_ACE_FLAG_INHERIT_ONLY,
+               },
+               {
+                       SEC_ACE_FLAG_INHERIT_ONLY | 
+                       SEC_ACE_FLAG_CONTAINER_INHERIT,
+                       0,
+                       SEC_ACE_FLAG_CONTAINER_INHERIT,
+               },
+               {
+                       SEC_ACE_FLAG_INHERIT_ONLY | 
+                       SEC_ACE_FLAG_CONTAINER_INHERIT | 
+                       SEC_ACE_FLAG_OBJECT_INHERIT,
+                       0,
+                       SEC_ACE_FLAG_CONTAINER_INHERIT | 
+                       SEC_ACE_FLAG_OBJECT_INHERIT,
+               },
+               {
+                       SEC_ACE_FLAG_INHERIT_ONLY | 
+                       SEC_ACE_FLAG_NO_PROPAGATE_INHERIT,
+                       0,
+                       0,
+               },
+               {
+                       SEC_ACE_FLAG_INHERIT_ONLY | 
+                       SEC_ACE_FLAG_NO_PROPAGATE_INHERIT | 
+                       SEC_ACE_FLAG_OBJECT_INHERIT,
+                       0,
+                       0,
+               },
+               {
+                       SEC_ACE_FLAG_INHERIT_ONLY | 
+                       SEC_ACE_FLAG_NO_PROPAGATE_INHERIT | 
+                       SEC_ACE_FLAG_CONTAINER_INHERIT,
+                       0,
+                       0,
+               },
+               {
+                       SEC_ACE_FLAG_INHERIT_ONLY | 
+                       SEC_ACE_FLAG_NO_PROPAGATE_INHERIT | 
+                       SEC_ACE_FLAG_CONTAINER_INHERIT | 
+                       SEC_ACE_FLAG_OBJECT_INHERIT,
+                       0,
+                       0,
+               }
+       };
+
+       smbcli_rmdir(cli->tree, dname);
+
+       printf("TESTING ACL INHERITANCE\n");
+
+       io.generic.level = RAW_OPEN_NTCREATEX;
+       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.flags = 0;
+       io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
+       io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_DIRECTORY;
+       io.ntcreatex.in.share_access = 0;
+       io.ntcreatex.in.alloc_size = 0;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE;
+       io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
+       io.ntcreatex.in.security_flags = 0;
+       io.ntcreatex.in.fname = dname;
+
+       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       fnum = io.ntcreatex.out.fnum;
+
+       printf("get the original sd\n");
+       q.query_secdesc.level = RAW_FILEINFO_SEC_DESC;
+       q.query_secdesc.in.fnum = fnum;
+       q.query_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER;
+       status = smb_raw_fileinfo(cli->tree, mem_ctx, &q);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       sd_orig = q.query_secdesc.out.sd;
+
+       owner_sid = dom_sid_string(mem_ctx, sd_orig->owner_sid);
+
+       printf("owner_sid is %s\n", owner_sid);
+
+       sd_def = security_descriptor_create(mem_ctx,
+                                           owner_sid, NULL,
+                                           owner_sid,
+                                           SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                           SEC_RIGHTS_FILE_ALL,
+                                           0,
+                                           SID_NT_SYSTEM,
+                                           SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                           SEC_RIGHTS_FILE_ALL,
+                                           0,
+                                           NULL);
+
+       creator_owner = dom_sid_parse_talloc(mem_ctx, SID_CREATOR_OWNER);
+
+       for (i=0;i<ARRAY_SIZE(test_flags);i++) {
+               sd = security_descriptor_create(mem_ctx,
+                                               NULL, NULL,
+                                               SID_CREATOR_OWNER,
+                                               SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                               SEC_FILE_WRITE_DATA,
+                                               test_flags[i].parent_flags,
+                                               SID_WORLD,
+                                               SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                               SEC_FILE_ALL | SEC_STD_ALL,
+                                               0,
+                                               NULL);
+               set.set_secdesc.level = RAW_SFILEINFO_SEC_DESC;
+               set.set_secdesc.file.fnum = fnum;
+               set.set_secdesc.in.secinfo_flags = SECINFO_DACL;
+               set.set_secdesc.in.sd = sd;
+               status = smb_raw_setfileinfo(cli->tree, &set);
+               CHECK_STATUS(status, NT_STATUS_OK);
+
+               io.ntcreatex.in.fname = fname1;
+               io.ntcreatex.in.create_options = 0;
+               status = smb_raw_open(cli->tree, mem_ctx, &io);
+               CHECK_STATUS(status, NT_STATUS_OK);
+               fnum2 = io.ntcreatex.out.fnum;
+
+               q.query_secdesc.in.fnum = fnum2;
+               status = smb_raw_fileinfo(cli->tree, mem_ctx, &q);
+               CHECK_STATUS(status, NT_STATUS_OK);
+
+               smbcli_close(cli->tree, fnum2);
+               smbcli_unlink(cli->tree, fname1);
+
+               if (!(test_flags[i].parent_flags & SEC_ACE_FLAG_OBJECT_INHERIT)) {
+                       if (!security_descriptor_equal(q.query_secdesc.out.sd, sd_def)) {
+                               printf("Expected default sd at %d - got:\n", i);
+                               NDR_PRINT_DEBUG(security_descriptor, q.query_secdesc.out.sd);
+                       }
+                       goto check_dir;
+               }
+
+               if (q.query_secdesc.out.sd->dacl == NULL ||
+                   q.query_secdesc.out.sd->dacl->num_aces != 1 ||
+                   q.query_secdesc.out.sd->dacl->aces[0].access_mask != SEC_FILE_WRITE_DATA ||
+                   !dom_sid_equal(&q.query_secdesc.out.sd->dacl->aces[0].trustee,
+                                  sd_orig->owner_sid)) {
+                       printf("Bad sd in child file at %d\n", i);
+                       NDR_PRINT_DEBUG(security_descriptor, q.query_secdesc.out.sd);
+                       ret = False;
+                       goto check_dir;
+               }
+
+               if (q.query_secdesc.out.sd->dacl->aces[0].flags != 
+                   test_flags[i].file_flags) {
+                       printf("incorrect file_flags 0x%x - expected 0x%x for parent 0x%x with (i=%d)\n",
+                              q.query_secdesc.out.sd->dacl->aces[0].flags,
+                              test_flags[i].file_flags,
+                              test_flags[i].parent_flags,
+                              i);
+                       ret = False;
+               }
+
+       check_dir:
+               io.ntcreatex.in.fname = fname2;
+               io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
+               status = smb_raw_open(cli->tree, mem_ctx, &io);
+               CHECK_STATUS(status, NT_STATUS_OK);
+               fnum2 = io.ntcreatex.out.fnum;
+
+               q.query_secdesc.in.fnum = fnum2;
+               status = smb_raw_fileinfo(cli->tree, mem_ctx, &q);
+               CHECK_STATUS(status, NT_STATUS_OK);
+
+               smbcli_close(cli->tree, fnum2);
+               smbcli_rmdir(cli->tree, fname2);
+
+               if (!(test_flags[i].parent_flags & SEC_ACE_FLAG_CONTAINER_INHERIT) &&
+                   (!(test_flags[i].parent_flags & SEC_ACE_FLAG_OBJECT_INHERIT) ||
+                    (test_flags[i].parent_flags & SEC_ACE_FLAG_NO_PROPAGATE_INHERIT))) {
+                       if (!security_descriptor_equal(q.query_secdesc.out.sd, sd_def)) {
+                               printf("Expected default sd for dir at %d - got:\n", i);
+                               NDR_PRINT_DEBUG(security_descriptor, q.query_secdesc.out.sd);
+                       }
+                       continue;
+               }
+
+               if ((test_flags[i].parent_flags & SEC_ACE_FLAG_CONTAINER_INHERIT) && 
+                   (test_flags[i].parent_flags & SEC_ACE_FLAG_NO_PROPAGATE_INHERIT)) {
+                       if (q.query_secdesc.out.sd->dacl == NULL ||
+                           q.query_secdesc.out.sd->dacl->num_aces != 1 ||
+                           q.query_secdesc.out.sd->dacl->aces[0].access_mask != SEC_FILE_WRITE_DATA ||
+                           !dom_sid_equal(&q.query_secdesc.out.sd->dacl->aces[0].trustee,
+                                          sd_orig->owner_sid) ||
+                           q.query_secdesc.out.sd->dacl->aces[0].flags != test_flags[i].dir_flags) {
+                               printf("Bad sd in child dir at %d (parent 0x%x)\n", 
+                                      i, test_flags[i].parent_flags);
+                               NDR_PRINT_DEBUG(security_descriptor, q.query_secdesc.out.sd);
+                               ret = False;
+                               continue;
+                       }
+               } else if (test_flags[i].parent_flags & SEC_ACE_FLAG_CONTAINER_INHERIT) {
+                       if (q.query_secdesc.out.sd->dacl == NULL ||
+                           q.query_secdesc.out.sd->dacl->num_aces != 2 ||
+                           q.query_secdesc.out.sd->dacl->aces[0].access_mask != SEC_FILE_WRITE_DATA ||
+                           !dom_sid_equal(&q.query_secdesc.out.sd->dacl->aces[0].trustee,
+                                          sd_orig->owner_sid) ||
+                           q.query_secdesc.out.sd->dacl->aces[1].access_mask != SEC_FILE_WRITE_DATA ||
+                           !dom_sid_equal(&q.query_secdesc.out.sd->dacl->aces[1].trustee,
+                                          creator_owner) ||
+                           q.query_secdesc.out.sd->dacl->aces[0].flags != 0 ||
+                           q.query_secdesc.out.sd->dacl->aces[1].flags != 
+                           (test_flags[i].dir_flags | SEC_ACE_FLAG_INHERIT_ONLY)) {
+                               printf("Bad sd in child dir at %d (parent 0x%x)\n", 
+                                      i, test_flags[i].parent_flags);
+                               NDR_PRINT_DEBUG(security_descriptor, q.query_secdesc.out.sd);
+                               ret = False;
+                               continue;
+                       }
+               } else {
+                       if (q.query_secdesc.out.sd->dacl == NULL ||
+                           q.query_secdesc.out.sd->dacl->num_aces != 1 ||
+                           q.query_secdesc.out.sd->dacl->aces[0].access_mask != SEC_FILE_WRITE_DATA ||
+                           !dom_sid_equal(&q.query_secdesc.out.sd->dacl->aces[0].trustee,
+                                          creator_owner) ||
+                           q.query_secdesc.out.sd->dacl->aces[0].flags != test_flags[i].dir_flags) {
+                               printf("Bad sd in child dir at %d (parent 0x%x)\n", 
+                                      i, test_flags[i].parent_flags);
+                               NDR_PRINT_DEBUG(security_descriptor, q.query_secdesc.out.sd);
+                               ret = False;
+                               continue;
+                       }
+               }
+       }
+
+       printf("testing access checks on inherited create with %s\n", fname1);
+       sd = security_descriptor_create(mem_ctx,
+                                       NULL, NULL,
+                                       owner_sid,
+                                       SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                       SEC_FILE_WRITE_DATA | SEC_STD_WRITE_DAC,
+                                       SEC_ACE_FLAG_OBJECT_INHERIT,
+                                       SID_WORLD,
+                                       SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                       SEC_FILE_ALL | SEC_STD_ALL,
+                                       0,
+                                       NULL);
+       set.set_secdesc.level = RAW_SFILEINFO_SEC_DESC;
+       set.set_secdesc.file.fnum = fnum;
+       set.set_secdesc.in.secinfo_flags = SECINFO_DACL;
+       set.set_secdesc.in.sd = sd;
+       status = smb_raw_setfileinfo(cli->tree, &set);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       io.ntcreatex.in.fname = fname1;
+       io.ntcreatex.in.create_options = 0;
+       io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE;
+       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       fnum2 = io.ntcreatex.out.fnum;
+       CHECK_ACCESS_FLAGS(fnum2, SEC_RIGHTS_FILE_ALL);
+
+       q.query_secdesc.in.fnum = fnum2;
+       q.query_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER;
+       status = smb_raw_fileinfo(cli->tree, mem_ctx, &q);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       smbcli_close(cli->tree, fnum2);
+
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
+       io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
+       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED);
+
+       io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA;
+       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       fnum2 = io.ntcreatex.out.fnum;
+       CHECK_ACCESS_FLAGS(fnum2, SEC_FILE_WRITE_DATA | SEC_FILE_READ_ATTRIBUTE);
+       smbcli_close(cli->tree, fnum2);
+
+       printf("put back original sd\n");
+       set.set_secdesc.level = RAW_SFILEINFO_SEC_DESC;
+       set.set_secdesc.file.fnum = fnum;
+       set.set_secdesc.in.secinfo_flags = SECINFO_DACL;
+       set.set_secdesc.in.sd = sd_orig;
+       status = smb_raw_setfileinfo(cli->tree, &set);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       smbcli_close(cli->tree, fnum);
+
+       io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
+       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED);
+
+       io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA;
+       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       fnum2 = io.ntcreatex.out.fnum;
+       CHECK_ACCESS_FLAGS(fnum2, SEC_FILE_WRITE_DATA | SEC_FILE_READ_ATTRIBUTE);
+       smbcli_close(cli->tree, fnum2);
+
+       smbcli_unlink(cli->tree, fname1);
+       smbcli_rmdir(cli->tree, dname);
 
 done:
+       set.set_secdesc.level = RAW_SFILEINFO_SEC_DESC;
+       set.set_secdesc.file.fnum = fnum;
+       set.set_secdesc.in.secinfo_flags = SECINFO_DACL;
+       set.set_secdesc.in.sd = sd_orig;
+       status = smb_raw_setfileinfo(cli->tree, &set);
+
        smbcli_close(cli->tree, fnum);
        return ret;
 }
 
 
+/*
+  test dynamic acl inheritance
+*/
+static BOOL test_inheritance_dynamic(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
+{
+       NTSTATUS status;
+       union smb_open io;
+       const char *dname = BASEDIR "\\inheritance";
+       const char *fname1 = BASEDIR "\\inheritance\\testfile";
+       BOOL ret = True;
+       int fnum, fnum2;
+       union smb_fileinfo q;
+       union smb_setfileinfo set;
+       struct security_descriptor *sd, *sd_orig;
+       const char *owner_sid;
+       
+       printf("TESTING DYNAMIC ACL INHERITANCE\n");
+
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return False;
+       }
+
+       io.generic.level = RAW_OPEN_NTCREATEX;
+       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.flags = 0;
+       io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
+       io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_DIRECTORY;
+       io.ntcreatex.in.share_access = 0;
+       io.ntcreatex.in.alloc_size = 0;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE;
+       io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
+       io.ntcreatex.in.security_flags = 0;
+       io.ntcreatex.in.fname = dname;
+
+       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       fnum = io.ntcreatex.out.fnum;
+
+       printf("get the original sd\n");
+       q.query_secdesc.level = RAW_FILEINFO_SEC_DESC;
+       q.query_secdesc.in.fnum = fnum;
+       q.query_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER;
+       status = smb_raw_fileinfo(cli->tree, mem_ctx, &q);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       sd_orig = q.query_secdesc.out.sd;
+
+       owner_sid = dom_sid_string(mem_ctx, sd_orig->owner_sid);
+
+       printf("owner_sid is %s\n", owner_sid);
+
+       sd = security_descriptor_create(mem_ctx,
+                                       NULL, NULL,
+                                       owner_sid,
+                                       SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                       SEC_FILE_WRITE_DATA | SEC_STD_DELETE | SEC_FILE_READ_ATTRIBUTE,
+                                       SEC_ACE_FLAG_OBJECT_INHERIT,
+                                       NULL);
+       sd->type |= SEC_DESC_DACL_AUTO_INHERITED | SEC_DESC_DACL_AUTO_INHERIT_REQ;
+
+       set.set_secdesc.level = RAW_SFILEINFO_SEC_DESC;
+       set.set_secdesc.file.fnum = fnum;
+       set.set_secdesc.in.secinfo_flags = SECINFO_DACL;
+       set.set_secdesc.in.sd = sd;
+       status = smb_raw_setfileinfo(cli->tree, &set);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       printf("create a file with an inherited acl\n");
+       io.ntcreatex.in.fname = fname1;
+       io.ntcreatex.in.create_options = 0;
+       io.ntcreatex.in.access_mask = SEC_FILE_READ_ATTRIBUTE;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE;
+       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       fnum2 = io.ntcreatex.out.fnum;
+       smbcli_close(cli->tree, fnum2);
+
+       printf("try and access file with base rights - should be OK\n");
+       io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
+       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       fnum2 = io.ntcreatex.out.fnum;
+       smbcli_close(cli->tree, fnum2);
+
+       printf("try and access file with extra rights - should be denied\n");
+       io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA | SEC_FILE_EXECUTE;
+       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED);
+
+       printf("update parent sd\n");
+       sd = security_descriptor_create(mem_ctx,
+                                       NULL, NULL,
+                                       owner_sid,
+                                       SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                       SEC_FILE_WRITE_DATA | SEC_STD_DELETE | SEC_FILE_READ_ATTRIBUTE | SEC_FILE_EXECUTE,
+                                       SEC_ACE_FLAG_OBJECT_INHERIT,
+                                       NULL);
+       sd->type |= SEC_DESC_DACL_AUTO_INHERITED | SEC_DESC_DACL_AUTO_INHERIT_REQ;
+
+       set.set_secdesc.in.sd = sd;
+       status = smb_raw_setfileinfo(cli->tree, &set);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       printf("try and access file with base rights - should be OK\n");
+       io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA;
+       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       fnum2 = io.ntcreatex.out.fnum;
+       smbcli_close(cli->tree, fnum2);
+
+
+       printf("try and access now - should be OK if dynamic inheritance works\n");
+       io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA | SEC_FILE_EXECUTE;
+       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+               printf("Server does not have dynamic inheritance\n");
+       }
+       if (NT_STATUS_EQUAL(status, NT_STATUS_OK)) {
+               printf("Server does have dynamic inheritance\n");
+       }
+       CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED);
+
+       smbcli_unlink(cli->tree, fname1);
+
+done:
+       printf("put back original sd\n");
+       set.set_secdesc.level = RAW_SFILEINFO_SEC_DESC;
+       set.set_secdesc.file.fnum = fnum;
+       set.set_secdesc.in.secinfo_flags = SECINFO_DACL;
+       set.set_secdesc.in.sd = sd_orig;
+       status = smb_raw_setfileinfo(cli->tree, &set);
+
+       smbcli_close(cli->tree, fnum);
+       smbcli_rmdir(cli->tree, dname);
+
+       return ret;
+}
+
+
 /* 
    basic testing of security descriptor calls
 */
@@ -671,6 +1422,9 @@ BOOL torture_raw_acls(void)
        ret &= test_nttrans_create(cli, mem_ctx);
        ret &= test_creator_sid(cli, mem_ctx);
        ret &= test_generic_bits(cli, mem_ctx);
+       ret &= test_owner_bits(cli, mem_ctx);
+       ret &= test_inheritance(cli, mem_ctx);
+       ret &= test_inheritance_dynamic(cli, mem_ctx);
 
        smb_raw_exit(cli->session);
        smbcli_deltree(cli->tree, BASEDIR);