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)

9 files changed, 47 insertions, 47 deletions

diff --git a/source4/torture/rpc/autoidl.c b/source4/torture/rpc/autoidl.c
index 49d0a5bcb80..0df88d2bf6a 100644
--- a/source4/torture/rpc/autoidl.c
+++ b/source4/torture/rpc/autoidl.c
@@ -57,7 +57,7 @@ static BOOL get_policy_handle(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	struct samr_Connect r;
 
 	r.in.system_name = 0;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.connect_handle = handle;
 
 	status = dcerpc_samr_Connect(p, mem_ctx, &r);
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 395ce7ab26a..83fb02f9d38 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -52,7 +52,7 @@ static BOOL test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
 	r.in.system_name = &system_name;
 	r.in.attr = &attr;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.handle = &handle;
 
 	status = dcerpc_lsa_OpenPolicy(p, mem_ctx, &r);
@@ -89,7 +89,7 @@ static BOOL test_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 	r.in.system_name = "\\";
 	r.in.attr = &attr;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.handle = handle;
 
 	status = dcerpc_lsa_OpenPolicy2(p, mem_ctx, &r);
@@ -403,7 +403,7 @@ static BOOL test_CreateAccount(struct dcerpc_pipe *p,
 
 	r.in.handle = handle;
 	r.in.sid = newsid;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.acct_handle = &acct_handle;
 
 	status = dcerpc_lsa_CreateAccount(p, mem_ctx, &r);
@@ -439,7 +439,7 @@ static BOOL test_CreateTrustedDomain(struct dcerpc_pipe *p,
 
 	r.in.handle = handle;
 	r.in.info = &trustinfo;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.dom_handle = &dom_handle;
 
 	status = dcerpc_lsa_CreateTrustedDomain(p, mem_ctx, &r);
@@ -484,7 +484,7 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
 	init_lsa_String(&r.in.name, secname);
 
 	r.in.handle = handle;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.sec_handle = &sec_handle;
 
 	status = dcerpc_lsa_CreateSecret(p, mem_ctx, &r);
@@ -494,7 +494,7 @@ static BOOL test_CreateSecret(struct dcerpc_pipe *p,
 	}
 
 	r2.in.handle = handle;
-	r2.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r2.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r2.in.name = r.in.name;
 	r2.out.sec_handle = &sec_handle2;
 
@@ -643,7 +643,7 @@ static BOOL test_OpenAccount(struct dcerpc_pipe *p,
 
 	r.in.handle = handle;
 	r.in.sid = sid;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.acct_handle = &acct_handle;
 
 	status = dcerpc_lsa_OpenAccount(p, mem_ctx, &r);
@@ -870,7 +870,7 @@ static BOOL test_EnumTrustDom(struct dcerpc_pipe *p,
 		
 		trust.in.handle = handle;
 		trust.in.sid = domains.domains[i].sid;
-		trust.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+		trust.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 		trust.out.trustdom_handle = &trustdom_handle;
 
 		status = dcerpc_lsa_OpenTrustedDomain(p, mem_ctx, &trust);
@@ -905,7 +905,7 @@ static BOOL test_EnumTrustDom(struct dcerpc_pipe *p,
 
 		trust_by_name.in.handle = handle;
 		trust_by_name.in.name = domains.domains[i].name;
-		trust_by_name.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+		trust_by_name.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 		trust_by_name.out.trustdom_handle = &trustdom_handle;
 		
 		status = dcerpc_lsa_OpenTrustedDomainByName(p, mem_ctx, &trust_by_name);
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 29ae5b9273d..0fa1bccace8 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -796,7 +796,7 @@ static NTSTATUS test_OpenUser_byname(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	}
 
 	r.in.domain_handle = domain_handle;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.in.rid = rid;
 	r.out.user_handle = user_handle;
 	status = dcerpc_samr_OpenUser(p, mem_ctx, &r);
@@ -1373,7 +1373,7 @@ static BOOL test_DeleteGroup_byname(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	}
 
 	r.in.domain_handle = handle;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.in.rid = rid;
 	r.out.group_handle = &group_handle;
 	status = dcerpc_samr_OpenGroup(p, mem_ctx, &r);
@@ -1413,7 +1413,7 @@ static BOOL test_DeleteAlias_byname(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	}
 
 	r.in.domain_handle = domain_handle;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.in.rid = rid;
 	r.out.alias_handle = &alias_handle;
 	status = dcerpc_samr_OpenAlias(p, mem_ctx, &r);
@@ -1469,7 +1469,7 @@ static BOOL test_CreateAlias(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	init_samr_String(&name, TEST_ALIASNAME);
 	r.in.domain_handle = domain_handle;
 	r.in.aliasname = &name;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.alias_handle = alias_handle;
 	r.out.rid = &rid;
 
@@ -1561,7 +1561,7 @@ static BOOL test_CreateUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 	r.in.domain_handle = domain_handle;
 	r.in.account_name = &name;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.user_handle = user_handle;
 	r.out.rid = &rid;
 
@@ -1710,7 +1710,7 @@ static BOOL test_CreateUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		r.in.domain_handle = handle;
 		r.in.account_name = &name;
 		r.in.acct_flags = acct_flags;
-		r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+		r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 		r.out.user_handle = &user_handle;
 		r.out.access_granted = &access_granted;
 		r.out.rid = &rid;
@@ -1977,7 +1977,7 @@ static BOOL test_OpenUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	printf("Testing OpenUser(%u)\n", rid);
 
 	r.in.domain_handle = handle;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.in.rid = rid;
 	r.out.user_handle = &user_handle;
 
@@ -2025,7 +2025,7 @@ static BOOL test_OpenGroup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	printf("Testing OpenGroup(%u)\n", rid);
 
 	r.in.domain_handle = handle;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.in.rid = rid;
 	r.out.group_handle = &group_handle;
 
@@ -2065,7 +2065,7 @@ static BOOL test_OpenAlias(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	printf("Testing OpenAlias(%u)\n", rid);
 
 	r.in.domain_handle = handle;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.in.rid = rid;
 	r.out.alias_handle = &alias_handle;
 
@@ -2810,7 +2810,7 @@ static BOOL test_CreateDomainGroup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 	r.in.domain_handle = domain_handle;
 	r.in.name = &name;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.group_handle = group_handle;
 	r.out.rid = &rid;
 
@@ -2894,7 +2894,7 @@ static BOOL test_OpenDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	printf("Testing OpenDomain\n");
 
 	r.in.connect_handle = handle;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.in.sid = sid;
 	r.out.domain_handle = &domain_handle;
 
@@ -3060,7 +3060,7 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	printf("testing samr_Connect\n");
 
 	r.in.system_name = 0;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.connect_handle = &h;
 
 	status = dcerpc_samr_Connect(p, mem_ctx, &r);
@@ -3075,7 +3075,7 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	printf("testing samr_Connect2\n");
 
 	r2.in.system_name = NULL;
-	r2.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r2.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r2.out.connect_handle = &h;
 
 	status = dcerpc_samr_Connect2(p, mem_ctx, &r2);
@@ -3094,7 +3094,7 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 	r3.in.system_name = NULL;
 	r3.in.unknown = 0;
-	r3.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r3.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r3.out.connect_handle = &h;
 
 	status = dcerpc_samr_Connect3(p, mem_ctx, &r3);
@@ -3113,7 +3113,7 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 	r4.in.system_name = "";
 	r4.in.unknown = 0;
-	r4.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r4.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r4.out.connect_handle = &h;
 
 	status = dcerpc_samr_Connect4(p, mem_ctx, &r4);
@@ -3134,7 +3134,7 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	info.info1.unknown2 = 0;
 
 	r5.in.system_name = "";
-	r5.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r5.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r5.in.level = 1;
 	r5.in.info = &info;
 	r5.out.info = &info;
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 42ac6fc1dc5..e85fa8db4f1 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -151,7 +151,7 @@ static struct policy_handle *samsync_open_domain(TALLOC_CTX *mem_ctx,
 	}
 
 	o.in.connect_handle = samsync_state->connect_handle;
-	o.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	o.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	o.in.sid = l.out.sid;
 	o.out.domain_handle = domain_handle;
 	
@@ -410,7 +410,7 @@ static BOOL samsync_handle_user(TALLOC_CTX *mem_ctx, struct samsync_state *samsy
 	}
 
 	r.in.domain_handle = samsync_state->domain_handle[database_id];
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.in.rid = rid;
 	r.out.user_handle = &user_handle;
 
@@ -612,7 +612,7 @@ static BOOL samsync_handle_alias(TALLOC_CTX *mem_ctx, struct samsync_state *sams
 	}
 
 	r.in.domain_handle = samsync_state->domain_handle[database_id];
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.in.rid = rid;
 	r.out.alias_handle = &alias_handle;
 
@@ -661,7 +661,7 @@ static BOOL samsync_handle_group(TALLOC_CTX *mem_ctx, struct samsync_state *sams
 	}
 
 	r.in.domain_handle = samsync_state->domain_handle[database_id];
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.in.rid = rid;
 	r.out.group_handle = &group_handle;
 
@@ -720,7 +720,7 @@ static BOOL samsync_handle_secret(TALLOC_CTX *mem_ctx, struct samsync_state *sam
 	DLIST_ADD(samsync_state->secrets, new);
 
 	o.in.handle = samsync_state->lsa_handle;
-	o.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	o.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	o.in.name.string = name;
 	o.out.sec_handle = &sec_handle;
 
@@ -805,7 +805,7 @@ static BOOL samsync_handle_trusted_domain(TALLOC_CTX *mem_ctx, struct samsync_st
 	new->sid = talloc_reference(new, dom_sid);
 
 	t.in.handle = samsync_state->lsa_handle;
-	t.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	t.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	t.in.sid = dom_sid;
 	t.out.trustdom_handle = &trustdom_handle;
 
@@ -862,7 +862,7 @@ static BOOL samsync_handle_account(TALLOC_CTX *mem_ctx, struct samsync_state *sa
 	BOOL *found_priv_in_lsa;
 
 	a.in.handle = samsync_state->lsa_handle;
-	a.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	a.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	a.in.sid = dom_sid;
 	a.out.acct_handle = &acct_handle;
 
@@ -1212,7 +1212,7 @@ BOOL torture_rpc_samsync(void)
 	samsync_state->connect_handle = talloc_zero_p(samsync_state, struct policy_handle);
 	samsync_state->lsa_handle = talloc_zero_p(samsync_state, struct policy_handle);
 	c.in.system_name = NULL;
-	c.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	c.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	c.out.connect_handle = samsync_state->connect_handle;
 
 	status = dcerpc_samr_Connect(samsync_state->p_samr, mem_ctx, &c);
@@ -1276,7 +1276,7 @@ BOOL torture_rpc_samsync(void)
 
 	r.in.system_name = "\\";
 	r.in.attr = &attr;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.handle = samsync_state->lsa_handle;
 
 	status = dcerpc_lsa_OpenPolicy2(samsync_state->p_lsa, mem_ctx, &r);
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 7d1718acaf2..bfd03810c25 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -694,7 +694,7 @@ static BOOL test_OpenPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	r.in.server = talloc_asprintf(mem_ctx, "\\\\%s\\%s", dcerpc_server_name(p), name);
 	r.in.printer = NULL;
 	r.in.buffer = &blob;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;	
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;	
 	r.out.handle = &handle;
 
 	printf("\nTesting OpenPrinter(\\\\%s)\n", r.in.server);
diff --git a/source4/torture/rpc/svcctl.c b/source4/torture/rpc/svcctl.c
index 3c40f06b323..efdf60bd3d1 100644
--- a/source4/torture/rpc/svcctl.c
+++ b/source4/torture/rpc/svcctl.c
@@ -80,7 +80,7 @@ static BOOL test_OpenSCManager(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struc
 	
 	r.in.MachineName = NULL;
 	r.in.DatabaseName = NULL;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.handle = h;
 	
 	status = dcerpc_svcctl_OpenSCManagerW(p, mem_ctx, &r);
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 9636b279320..d034446adba 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -60,7 +60,7 @@ static NTSTATUS DeleteUser_byname(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	}
 
 	r.in.domain_handle = handle;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.in.rid = rid;
 	r.out.user_handle = &user_handle;
 
@@ -125,7 +125,7 @@ struct test_join *torture_join_domain(const char *machine_name,
 	}
 
 	c.in.system_name = NULL;
-	c.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	c.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	c.out.connect_handle = &handle;
 
 	status = dcerpc_samr_Connect(join->p, join, &c);
@@ -151,7 +151,7 @@ struct test_join *torture_join_domain(const char *machine_name,
 	}
 
 	o.in.connect_handle = &handle;
-	o.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	o.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	o.in.sid = l.out.sid;
 	o.out.domain_handle = &domain_handle;
 
@@ -168,7 +168,7 @@ again:
 	r.in.domain_handle = &domain_handle;
 	r.in.account_name = &name;
 	r.in.acct_flags = acct_flags;
-	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.user_handle = &join->user_handle;
 	r.out.access_granted = &access_granted;
 	r.out.rid = &rid;
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 379653ddf79..9cb41c032b5 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -348,7 +348,7 @@ static BOOL test_OpenHKLM(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	unknown.unknown0 = 0x84e0;
 	unknown.unknown1 = 0x0000;
 	r.in.unknown = &unknown;
-	r.in.access_required = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_required = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.handle = handle;
 
 	status = dcerpc_winreg_OpenHKLM(p, mem_ctx, &r);
@@ -379,7 +379,7 @@ static BOOL test_OpenHKU(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	unknown.unknown0 = 0x84e0;
 	unknown.unknown1 = 0x0000;
 	r.in.unknown = &unknown;
-	r.in.access_required = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_required = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.handle = handle;
 
 	status = dcerpc_winreg_OpenHKU(p, mem_ctx, &r);
@@ -405,7 +405,7 @@ static BOOL test_OpenHKCR(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	unknown.unknown0 = 0x84e0;
 	unknown.unknown1 = 0x0000;
 	r.in.unknown = &unknown;
-	r.in.access_required = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_required = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.handle = handle;
 
 	status = dcerpc_winreg_OpenHKCR(p, mem_ctx, &r);
@@ -479,7 +479,7 @@ static BOOL test_OpenHKCU(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	unknown.unknown0 = 0x84e0;
 	unknown.unknown1 = 0x0000;
 	r.in.unknown = &unknown;
-	r.in.access_required = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.in.access_required = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.handle = handle;
 
 	status = dcerpc_winreg_OpenHKCU(p, mem_ctx, &r);
diff --git a/source4/torture/rpc/xplogin.c b/source4/torture/rpc/xplogin.c
index bb09b7cf098..8b7ccf115df 100644
--- a/source4/torture/rpc/xplogin.c
+++ b/source4/torture/rpc/xplogin.c
@@ -639,7 +639,7 @@ static NTSTATUS test_getgroups(struct smbcli_transport *transport,
 	r4.in.system_name = talloc_asprintf(mem_ctx, "\\\\%s",
 					    dcerpc_server_name(p));
 	r4.in.unknown = 0;
-	r4.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r4.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r4.out.connect_handle = &connect_handle;
 
 	status = dcerpc_samr_Connect4(p, mem_ctx, &r4);
@@ -804,7 +804,7 @@ static NTSTATUS test_getallsids(struct smbcli_transport *transport,
 	r4.in.system_name = talloc_asprintf(mem_ctx, "\\\\%s",
 					    dcerpc_server_name(p));
 	r4.in.unknown = 0;
-	r4.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r4.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r4.out.connect_handle = &connect_handle;
 
 	status = dcerpc_samr_Connect4(p, mem_ctx, &r4);