summaryrefslogtreecommitdiffstats
path: root/source/torture/basic/rename.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-30 04:33:27 +0000
committerAndrew Tridgell <tridge@samba.org>2004-11-30 04:33:27 +0000
commitccaee9dbd71c497540b1f6792869191793634b93 (patch)
treec69fc5a6fd321f422b4f88afa2d235dbd33b2bb3 /source/torture/basic/rename.c
parent55256c360a26511a16ca36c8b6719356282550dd (diff)
downloadsamba-ccaee9dbd71c497540b1f6792869191793634b93.tar.gz
samba-ccaee9dbd71c497540b1f6792869191793634b93.tar.xz
samba-ccaee9dbd71c497540b1f6792869191793634b93.zip
r4011: get rid of rpc_secdes.h and replace it with a single sane set of
definitions for security access masks, in security.idl The previous definitions were inconsistently named, and contained many duplicate and misleading entries. I kept finding myself tripping up while using them.
Diffstat (limited to 'source/torture/basic/rename.c')
-rw-r--r--source/torture/basic/rename.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/torture/basic/rename.c b/source/torture/basic/rename.c
index e26c85b5df9..3f7be04a8eb 100644
--- a/source/torture/basic/rename.c
+++ b/source/torture/basic/rename.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "librpc/gen_ndr/ndr_security.h"
/*
Test rename on files open with share delete and no share delete.
@@ -42,7 +43,7 @@ BOOL torture_test_rename(void)
smbcli_unlink(cli1->tree, fname);
smbcli_unlink(cli1->tree, fname1);
fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0,
- GENERIC_RIGHTS_FILE_READ,
+ SEC_RIGHTS_FILE_READ,
FILE_ATTRIBUTE_NORMAL,
NTCREATEX_SHARE_ACCESS_READ,
NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
@@ -69,7 +70,7 @@ BOOL torture_test_rename(void)
smbcli_unlink(cli1->tree, fname);
smbcli_unlink(cli1->tree, fname1);
fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0,
- GENERIC_RIGHTS_FILE_READ,
+ SEC_RIGHTS_FILE_READ,
FILE_ATTRIBUTE_NORMAL,
NTCREATEX_SHARE_ACCESS_DELETE|NTCREATEX_SHARE_ACCESS_READ,
NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
@@ -97,7 +98,7 @@ BOOL torture_test_rename(void)
smbcli_unlink(cli1->tree, fname1);
fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0,
- STD_RIGHT_READ_CONTROL_ACCESS,
+ SEC_STD_READ_CONTROL,
FILE_ATTRIBUTE_NORMAL,
NTCREATEX_SHARE_ACCESS_NONE,
NTCREATEX_DISP_OVERWRITE_IF, 0, 0);