diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-12-02 04:37:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:06:16 -0500 |
| commit | cc8f4358cca2404895015e2351394f2f4a16e025 (patch) | |
| tree | 1da58580fff856f4f14c577c910e0ea5cb4af817 /source4/torture/basic/delete.c | |
| parent | 81476cd9fad32f5629de44d45c3a9c58d67e5864 (diff) | |
| download | samba-cc8f4358cca2404895015e2351394f2f4a16e025.tar.gz samba-cc8f4358cca2404895015e2351394f2f4a16e025.tar.bz2 samba-cc8f4358cca2404895015e2351394f2f4a16e025.zip | |
r4035: more effort on consistent naming of the access mask bits.
This removes the duplicate named SEC_RIGHTS_MAXIMUM_ALLOWED and
SEC_RIGHTS_FULL_CONTROL, which are just other names for
SEC_FLAG_MAXIMUM_ALLOWED and SEC_RIGHTS_FILE_ALL. The latter names
match the new naming conventions in security.idl
Also added names for the generic->specific mappings for files are
directories
(This used to be commit 17a4e0b3aca227b40957ed1e0c57e498debc6ddf)
Diffstat (limited to 'source4/torture/basic/delete.c')
| -rw-r--r-- | source4/torture/basic/delete.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c index 99be602de9..3247a7cd28 100644 --- a/source4/torture/basic/delete.c +++ b/source4/torture/basic/delete.c @@ -49,7 +49,7 @@ BOOL torture_test_delete(void) smbcli_unlink(cli1->tree, fname); fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, - SEC_RIGHTS_FULL_CONTROL, + SEC_RIGHTS_FILE_ALL, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OVERWRITE_IF, NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0); @@ -84,7 +84,7 @@ BOOL torture_test_delete(void) smbcli_unlink(cli1->tree, fname); fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, - SEC_RIGHTS_FULL_CONTROL, + SEC_RIGHTS_FILE_ALL, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); @@ -128,7 +128,7 @@ BOOL torture_test_delete(void) smbcli_unlink(cli1->tree, fname); fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, - SEC_RIGHTS_FULL_CONTROL, + SEC_RIGHTS_FILE_ALL, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); @@ -535,7 +535,7 @@ BOOL torture_test_delete(void) smbcli_unlink(cli1->tree, fname); fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, - SEC_RIGHTS_FULL_CONTROL, + SEC_RIGHTS_FILE_ALL, FILE_ATTRIBUTE_READONLY, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); @@ -571,7 +571,7 @@ BOOL torture_test_delete(void) /* test 12 - does having read only attribute still allow delete on close at time of open. */ fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, - SEC_RIGHTS_FULL_CONTROL, + SEC_RIGHTS_FILE_ALL, FILE_ATTRIBUTE_READONLY, NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OVERWRITE_IF, NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0); |