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)

6 files changed, 10 insertions, 10 deletions

diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c
index 1024c1cd26..5154da8563 100644
--- a/source4/torture/basic/charset.c
+++ b/source4/torture/basic/charset.c
@@ -68,7 +68,7 @@ static NTSTATUS unicode_open(struct smbcli_tree *tree,
 	io.generic.level = RAW_OPEN_NTCREATEX;
 	io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED;
 	io.ntcreatex.in.root_fid = 0;
-	io.ntcreatex.in.access_mask = SEC_RIGHTS_FULL_CONTROL;
+	io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
 	io.ntcreatex.in.alloc_size = 0;
 	io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
 	io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
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);
diff --git a/source4/torture/basic/dir.c b/source4/torture/basic/dir.c
index 1394ef5b5b..d7721ce5ae 100644
--- a/source4/torture/basic/dir.c
+++ b/source4/torture/basic/dir.c
@@ -111,7 +111,7 @@ BOOL torture_dirtest2(void)
 		char *fname;
 		asprintf(&fname, "\\LISTDIR\\f%d", i);
 		fnum = smbcli_nt_create_full(cli->tree, fname, 0, 
-					     SEC_RIGHTS_FULL_CONTROL,
+					     SEC_RIGHTS_FILE_ALL,
 					     FILE_ATTRIBUTE_ARCHIVE,
 					     NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, 
 					     NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c
index 08a870334d..4a92b5f31a 100644
--- a/source4/torture/basic/scanner.c
+++ b/source4/torture/basic/scanner.c
@@ -267,7 +267,7 @@ BOOL torture_trans2_scan(void)
 	}
 	qfnum = smbcli_nt_create_full(cli->tree, "\\$Extend\\$Quota:$Q:$INDEX_ALLOCATION", 
 				   NTCREATEX_FLAGS_EXTENDED, 
-				   SEC_RIGHTS_MAXIMUM_ALLOWED, 
+				   SEC_FLAG_MAXIMUM_ALLOWED, 
 				   0,
 				   NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, 
 				   NTCREATEX_DISP_OPEN, 
diff --git a/source4/torture/basic/unlink.c b/source4/torture/basic/unlink.c
index 3fe0ea8f28..75d1549fcf 100644
--- a/source4/torture/basic/unlink.c
+++ b/source4/torture/basic/unlink.c
@@ -82,7 +82,7 @@ BOOL torture_unlinktest(void)
 	io.ntcreatex.in.security_flags = 0;
 	io.ntcreatex.in.fname = fname;
 	io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_DELETE;
-	io.ntcreatex.in.access_mask  = SEC_RIGHTS_FULL_CONTROL;
+	io.ntcreatex.in.access_mask  = SEC_RIGHTS_FILE_ALL;
 
 	status = smb_raw_open(cli->tree, cli, &io);
 	if (!NT_STATUS_IS_OK(status)) {
diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c
index dcd00b9fbb..f9233595cf 100644
--- a/source4/torture/basic/utable.c
+++ b/source4/torture/basic/utable.c
@@ -151,7 +151,7 @@ BOOL torture_casetable(void)
 #if 0
 					     SEC_RIGHT_MAXIMUM_ALLOWED, 
 #else
-					     SEC_RIGHTS_FULL_CONTROL,
+					     SEC_RIGHTS_FILE_ALL,
 #endif
 					     FILE_ATTRIBUTE_NORMAL,
 					     NTCREATEX_SHARE_ACCESS_NONE,