summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2002-10-07 15:51:21 +0000
committerSimo Sorce <idra@samba.org>2002-10-07 15:51:21 +0000
commit774081486597fb477c89d9a3ad4897527b22830e (patch)
treef058e6517cd8af8a40cf657a943f821cede48242
parent650e0274a1ea98a953b2e6f44e7e8e880d418565 (diff)
downloadsamba-774081486597fb477c89d9a3ad4897527b22830e.tar.gz
samba-774081486597fb477c89d9a3ad4897527b22830e.tar.bz2
samba-774081486597fb477c89d9a3ad4897527b22830e.zip
forgot some bits from previous rpc_secdesc.h rework patch
(This used to be commit 738b9237eda8fdb8adb534ab1a84070923f352f1)
-rw-r--r--source3/include/smb.h2
-rw-r--r--source3/torture/cmd_sam.c6
2 files changed, 3 insertions, 5 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 1694a8b0fc..822f2485dd 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1059,8 +1059,6 @@ struct bitmap {
#define DESIRED_ACCESS_PIPE 0x2019f
/* Generic access masks & rights. */
-#define SPECIFIC_RIGHTS_MASK 0x00FFFFL
-#define STANDARD_RIGHTS_MASK 0xFF0000L
#define DELETE_ACCESS (1L<<16) /* 0x00010000 */
#define READ_CONTROL_ACCESS (1L<<17) /* 0x00020000 */
#define WRITE_DAC_ACCESS (1L<<18) /* 0x00040000 */
diff --git a/source3/torture/cmd_sam.c b/source3/torture/cmd_sam.c
index eb8c17f2f9..3f7f7dfe27 100644
--- a/source3/torture/cmd_sam.c
+++ b/source3/torture/cmd_sam.c
@@ -218,7 +218,7 @@ static NTSTATUS cmd_show_domain(struct samtest_state *st, TALLOC_CTX *mem_ctx, i
return NT_STATUS_INVALID_PARAMETER;
}
- if (!NT_STATUS_IS_OK(status = sam_get_domain_by_sid(st->context, st->token, DOMAIN_ALL_ACCESS, &sid, &domain))) {
+ if (!NT_STATUS_IS_OK(status = sam_get_domain_by_sid(st->context, st->token, GENERIC_RIGHTS_DOMAIN_ALL_ACCESS, &sid, &domain))) {
printf("sam_get_domain_by_sid failed\n");
return status;
}
@@ -379,7 +379,7 @@ static NTSTATUS cmd_lookup_account_sid(struct samtest_state *st, TALLOC_CTX *mem
return NT_STATUS_INVALID_PARAMETER;
}
- if (!NT_STATUS_IS_OK(status = sam_get_account_by_sid(st->context, st->token, USER_ALL_ACCESS, &sid, &account))) {
+ if (!NT_STATUS_IS_OK(status = sam_get_account_by_sid(st->context, st->token, GENERIC_RIGHTS_USER_ALL_ACCESS, &sid, &account))) {
printf("context_sam_get_account_by_sid failed: %s\n", nt_errstr(status));
return status;
}
@@ -400,7 +400,7 @@ static NTSTATUS cmd_lookup_account_name(struct samtest_state *st, TALLOC_CTX *me
}
- if (!NT_STATUS_IS_OK(status = sam_get_account_by_name(st->context, st->token, USER_ALL_ACCESS, argv[1], argv[2], &account))) {
+ if (!NT_STATUS_IS_OK(status = sam_get_account_by_name(st->context, st->token, GENERIC_RIGHTS_USER_ALL_ACCESS, argv[1], argv[2], &account))) {
printf("context_sam_get_account_by_sid failed: %s\n", nt_errstr(status));
return status;
}