forgot some bits from previous rpc_secdesc.h rework patch

(This used to be commit 738b9237eda8fdb8adb534ab1a84070923f352f1)

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 1694a8b0fccfca476a30009d793a4c6422132e71..822f2485dd5981f2db06020a5a142f83dbcc2e8d 100644 (file)
--- 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 eb8c17f2f96374824fd6be426aee1cb2d7950645..3f7f7dfe27e9d7bf222f085d80880c46cb4088a7 100644 (file)
--- 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;
        }