The branch, v3-4-test has been updated
via e14d0a1b3b4875db08d967131efb4e300d22bc12 (commit)
via 3f9e43e026d904798998a3d94e7f2e9318fd4d85 (commit)
via 3821bd0dec854e4ded4f01f58a13a65068be5643 (commit)
from 86e10fee0284bc1b9e68c0fc9720b80df3580517 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit e14d0a1b3b4875db08d967131efb4e300d22bc12
Author: Günther Deschner <[email protected]>
Date: Tue May 19 02:01:27 2009 +0200
s4-smbtorture: Fix build warning in RPC-SAMR tests.
Guenther
(cherry picked from commit 518666102367ce21782cb0f597c136ac125cef05)
commit 3f9e43e026d904798998a3d94e7f2e9318fd4d85
Author: Günther Deschner <[email protected]>
Date: Tue May 19 02:00:34 2009 +0200
s3: re-run make samba3-idl.
Guenther
(cherry picked from commit d7142fb1b56073ca0d078d0214f70c2c77186fce)
commit 3821bd0dec854e4ded4f01f58a13a65068be5643
Author: Günther Deschner <[email protected]>
Date: Tue May 19 01:59:55 2009 +0200
lsa: add access_masks for accounts, secrets and trusted domains to IDL.
Guenther
(cherry picked from commit 7c22eed419fe877c51c6c4d1fecea0e2e4aa0b1b)
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/lsa.h | 20 +++++++++++
librpc/gen_ndr/ndr_lsa.c | 77 ++++++++++++++++++++++++++++++++++++++++++++
librpc/gen_ndr/ndr_lsa.h | 9 +++++
librpc/idl/lsa.idl | 25 ++++++++++++++-
source4/torture/rpc/samr.c | 4 +-
5 files changed, 132 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/lsa.h b/librpc/gen_ndr/lsa.h
index a6da7a6..132630b 100644
--- a/librpc/gen_ndr/lsa.h
+++ b/librpc/gen_ndr/lsa.h
@@ -98,6 +98,26 @@ struct lsa_ObjectAttribute {
#define LSA_POLICY_AUDIT_LOG_ADMIN ( 0x00000200 )
#define LSA_POLICY_SERVER_ADMIN ( 0x00000400 )
#define LSA_POLICY_LOOKUP_NAMES ( 0x00000800 )
+#define LSA_POLICY_NOTIFICATION ( 0x00001000 )
+
+/* bitmap lsa_AccountAccessMask */
+#define LSA_ACCOUNT_VIEW ( 0x00000001 )
+#define LSA_ACCOUNT_ADJUST_PRIVILEGES ( 0x00000002 )
+#define LSA_ACCOUNT_ADJUST_QUOTAS ( 0x00000004 )
+#define LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS ( 0x00000008 )
+
+/* bitmap lsa_SecretAccessMask */
+#define LSA_SECRET_SET_VALUE ( 0x00000001 )
+#define LSA_SECRET_QUERY_VALUE ( 0x00000002 )
+
+/* bitmap lsa_TrustedAccessMask */
+#define LSA_TRUSTED_QUERY_DOMAIN_NAME ( 0x00000001 )
+#define LSA_TRUSTED_QUERY_CONTROLLERS ( 0x00000002 )
+#define LSA_TRUSTED_SET_CONTROLLERS ( 0x00000004 )
+#define LSA_TRUSTED_QUERY_POSIX ( 0x00000008 )
+#define LSA_TRUSTED_SET_POSIX ( 0x00000010 )
+#define LSA_TRUSTED_SET_AUTH ( 0x00000020 )
+#define LSA_TRUSTED_QUERY_AUTH ( 0x00000040 )
struct lsa_AuditLogInfo {
uint32_t percent_full;
diff --git a/librpc/gen_ndr/ndr_lsa.c b/librpc/gen_ndr/ndr_lsa.c
index 793404a..2aee3f7 100644
--- a/librpc/gen_ndr/ndr_lsa.c
+++ b/librpc/gen_ndr/ndr_lsa.c
@@ -828,6 +828,83 @@ _PUBLIC_ void ndr_print_lsa_PolicyAccessMask(struct
ndr_print *ndr, const char *
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"LSA_POLICY_AUDIT_LOG_ADMIN", LSA_POLICY_AUDIT_LOG_ADMIN, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "LSA_POLICY_SERVER_ADMIN",
LSA_POLICY_SERVER_ADMIN, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "LSA_POLICY_LOOKUP_NAMES",
LSA_POLICY_LOOKUP_NAMES, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "LSA_POLICY_NOTIFICATION",
LSA_POLICY_NOTIFICATION, r);
+ ndr->depth--;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_lsa_AccountAccessMask(struct ndr_push
*ndr, int ndr_flags, uint32_t r)
+{
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_lsa_AccountAccessMask(struct ndr_pull
*ndr, int ndr_flags, uint32_t *r)
+{
+ uint32_t v;
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+ *r = v;
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_lsa_AccountAccessMask(struct ndr_print *ndr, const
char *name, uint32_t r)
+{
+ ndr_print_uint32(ndr, name, r);
+ ndr->depth++;
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "LSA_ACCOUNT_VIEW",
LSA_ACCOUNT_VIEW, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"LSA_ACCOUNT_ADJUST_PRIVILEGES", LSA_ACCOUNT_ADJUST_PRIVILEGES, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"LSA_ACCOUNT_ADJUST_QUOTAS", LSA_ACCOUNT_ADJUST_QUOTAS, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS", LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS, r);
+ ndr->depth--;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_lsa_SecretAccessMask(struct ndr_push *ndr,
int ndr_flags, uint32_t r)
+{
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_lsa_SecretAccessMask(struct ndr_pull *ndr,
int ndr_flags, uint32_t *r)
+{
+ uint32_t v;
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+ *r = v;
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_lsa_SecretAccessMask(struct ndr_print *ndr, const char
*name, uint32_t r)
+{
+ ndr_print_uint32(ndr, name, r);
+ ndr->depth++;
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "LSA_SECRET_SET_VALUE",
LSA_SECRET_SET_VALUE, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "LSA_SECRET_QUERY_VALUE",
LSA_SECRET_QUERY_VALUE, r);
+ ndr->depth--;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_lsa_TrustedAccessMask(struct ndr_push
*ndr, int ndr_flags, uint32_t r)
+{
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_lsa_TrustedAccessMask(struct ndr_pull
*ndr, int ndr_flags, uint32_t *r)
+{
+ uint32_t v;
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+ *r = v;
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_lsa_TrustedAccessMask(struct ndr_print *ndr, const
char *name, uint32_t r)
+{
+ ndr_print_uint32(ndr, name, r);
+ ndr->depth++;
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"LSA_TRUSTED_QUERY_DOMAIN_NAME", LSA_TRUSTED_QUERY_DOMAIN_NAME, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"LSA_TRUSTED_QUERY_CONTROLLERS", LSA_TRUSTED_QUERY_CONTROLLERS, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"LSA_TRUSTED_SET_CONTROLLERS", LSA_TRUSTED_SET_CONTROLLERS, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "LSA_TRUSTED_QUERY_POSIX",
LSA_TRUSTED_QUERY_POSIX, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "LSA_TRUSTED_SET_POSIX",
LSA_TRUSTED_SET_POSIX, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "LSA_TRUSTED_SET_AUTH",
LSA_TRUSTED_SET_AUTH, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "LSA_TRUSTED_QUERY_AUTH",
LSA_TRUSTED_QUERY_AUTH, r);
ndr->depth--;
}
diff --git a/librpc/gen_ndr/ndr_lsa.h b/librpc/gen_ndr/ndr_lsa.h
index 90817b5..cc7ade5 100644
--- a/librpc/gen_ndr/ndr_lsa.h
+++ b/librpc/gen_ndr/ndr_lsa.h
@@ -202,6 +202,15 @@ void ndr_print_lsa_ObjectAttribute(struct ndr_print *ndr,
const char *name, cons
enum ndr_err_code ndr_push_lsa_PolicyAccessMask(struct ndr_push *ndr, int
ndr_flags, uint32_t r);
enum ndr_err_code ndr_pull_lsa_PolicyAccessMask(struct ndr_pull *ndr, int
ndr_flags, uint32_t *r);
void ndr_print_lsa_PolicyAccessMask(struct ndr_print *ndr, const char *name,
uint32_t r);
+enum ndr_err_code ndr_push_lsa_AccountAccessMask(struct ndr_push *ndr, int
ndr_flags, uint32_t r);
+enum ndr_err_code ndr_pull_lsa_AccountAccessMask(struct ndr_pull *ndr, int
ndr_flags, uint32_t *r);
+void ndr_print_lsa_AccountAccessMask(struct ndr_print *ndr, const char *name,
uint32_t r);
+enum ndr_err_code ndr_push_lsa_SecretAccessMask(struct ndr_push *ndr, int
ndr_flags, uint32_t r);
+enum ndr_err_code ndr_pull_lsa_SecretAccessMask(struct ndr_pull *ndr, int
ndr_flags, uint32_t *r);
+void ndr_print_lsa_SecretAccessMask(struct ndr_print *ndr, const char *name,
uint32_t r);
+enum ndr_err_code ndr_push_lsa_TrustedAccessMask(struct ndr_push *ndr, int
ndr_flags, uint32_t r);
+enum ndr_err_code ndr_pull_lsa_TrustedAccessMask(struct ndr_pull *ndr, int
ndr_flags, uint32_t *r);
+void ndr_print_lsa_TrustedAccessMask(struct ndr_print *ndr, const char *name,
uint32_t r);
void ndr_print_lsa_AuditLogInfo(struct ndr_print *ndr, const char *name, const
struct lsa_AuditLogInfo *r);
void ndr_print_lsa_PolicyAuditPolicy(struct ndr_print *ndr, const char *name,
enum lsa_PolicyAuditPolicy r);
void ndr_print_lsa_AuditEventsInfo(struct ndr_print *ndr, const char *name,
const struct lsa_AuditEventsInfo *r);
diff --git a/librpc/idl/lsa.idl b/librpc/idl/lsa.idl
index ea787b2..a0b0e9d 100644
--- a/librpc/idl/lsa.idl
+++ b/librpc/idl/lsa.idl
@@ -140,7 +140,8 @@ import "misc.idl", "security.idl";
LSA_POLICY_SET_AUDIT_REQUIREMENTS = 0x00000100,
LSA_POLICY_AUDIT_LOG_ADMIN = 0x00000200,
LSA_POLICY_SERVER_ADMIN = 0x00000400,
- LSA_POLICY_LOOKUP_NAMES = 0x00000800
+ LSA_POLICY_LOOKUP_NAMES = 0x00000800,
+ LSA_POLICY_NOTIFICATION = 0x00001000
} lsa_PolicyAccessMask;
const int LSA_POLICY_ALL_ACCESS =
@@ -180,6 +181,28 @@ import "misc.idl", "security.idl";
LSA_POLICY_VIEW_LOCAL_INFORMATION |
LSA_POLICY_LOOKUP_NAMES);
+ typedef [public,bitmap32bit] bitmap {
+ LSA_ACCOUNT_VIEW = 0x00000001,
+ LSA_ACCOUNT_ADJUST_PRIVILEGES = 0x00000002,
+ LSA_ACCOUNT_ADJUST_QUOTAS = 0x00000004,
+ LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS = 0x00000008
+ } lsa_AccountAccessMask;
+
+ typedef [public,bitmap32bit] bitmap {
+ LSA_SECRET_SET_VALUE = 0x00000001,
+ LSA_SECRET_QUERY_VALUE = 0x00000002
+ } lsa_SecretAccessMask;
+
+ typedef [public,bitmap32bit] bitmap {
+ LSA_TRUSTED_QUERY_DOMAIN_NAME = 0x00000001,
+ LSA_TRUSTED_QUERY_CONTROLLERS = 0x00000002,
+ LSA_TRUSTED_SET_CONTROLLERS = 0x00000004,
+ LSA_TRUSTED_QUERY_POSIX = 0x00000008,
+ LSA_TRUSTED_SET_POSIX = 0x00000010,
+ LSA_TRUSTED_SET_AUTH = 0x00000020,
+ LSA_TRUSTED_QUERY_AUTH = 0x00000040
+ } lsa_TrustedAccessMask;
+
/* notice the screwup with the system_name - thats why MS created
OpenPolicy2 */
[public] NTSTATUS lsa_OpenPolicy (
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 080f8e4..4ee634b 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -6450,9 +6450,9 @@ static bool torture_rpc_samr_pwdlastset(struct
torture_context *torture,
return ret;
}
-struct torture_suite *torture_rpc_samr_passwords_pwdlastset(struct
torture_context *tctx)
+struct torture_suite *torture_rpc_samr_passwords_pwdlastset(TALLOC_CTX
*mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(tctx,
"SAMR-PASSWORDS-PWDLASTSET");
+ struct torture_suite *suite = torture_suite_create(nmem_ctx,
"SAMR-PASSWORDS-PWDLASTSET");
struct torture_rpc_tcase *tcase;
tcase = torture_suite_add_machine_rpc_iface_tcase(suite, "samr",
--
Samba Shared Repository
