From: Andrew Tridgell Date: Tue, 11 Nov 2003 06:54:54 +0000 (+0000) Subject: added QueryPolicyInfo/PrimaryDomainInfo idl and test code X-Git-Tag: samba-4.0.0alpha6~801^3~15210 X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=c614ea5435e3a4c9b6e05dcde9daa7d38f7131ca added QueryPolicyInfo/PrimaryDomainInfo idl and test code (This used to be commit b754ad2eae517abacaa26d9e28a8bf6164274971) --- diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl index 0fdaa6afd29..7acbe9cb6b1 100644 --- a/source4/librpc/idl/lsa.idl +++ b/source4/librpc/idl/lsa.idl @@ -117,9 +117,15 @@ lsa_AuditSettings *settings; } lsa_AuditEventsInfo; + typedef struct { + lsa_Name name; + dom_sid2 *sid; + } lsa_PrimaryDomainInfo; + typedef union { case(1) lsa_AuditLogInfo audit_log; case(2) lsa_AuditEventsInfo audit_events; + case(3) lsa_PrimaryDomainInfo domain; } lsa_PolicyInformation; NTSTATUS lsa_QueryInfoPolicy ( diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c index 3cb9e387496..ec065f63cc2 100644 --- a/source4/librpc/ndr/ndr_basic.c +++ b/source4/librpc/ndr/ndr_basic.c @@ -206,12 +206,15 @@ NTSTATUS ndr_push_uint32(struct ndr_push *ndr, uint32 v) return NT_STATUS_OK; } -/* - align to a uint32 -*/ -NTSTATUS ndr_push_align_uint32(struct ndr_push *ndr) +NTSTATUS ndr_push_align(struct ndr_push *ndr, size_t size) { - NDR_PUSH_ALIGN(ndr, 4); + NDR_PUSH_ALIGN(ndr, size); + return NT_STATUS_OK; +} + +NTSTATUS ndr_pull_align(struct ndr_pull *ndr, size_t size) +{ + NDR_PULL_ALIGN(ndr, size); return NT_STATUS_OK; } diff --git a/source4/librpc/ndr/ndr_lsa.c b/source4/librpc/ndr/ndr_lsa.c index 20591c04ab0..a1379b6452d 100644 --- a/source4/librpc/ndr/ndr_lsa.c +++ b/source4/librpc/ndr/ndr_lsa.c @@ -33,6 +33,7 @@ NTSTATUS ndr_pull_lsa_Delete(struct ndr_pull *ndr, struct lsa_Delete *r) static NTSTATUS ndr_push_lsa_Name(struct ndr_push *ndr, int ndr_flags, struct lsa_Name *r) { + NDR_CHECK(ndr_push_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_push_uint16(ndr, r->name_len)); NDR_CHECK(ndr_push_uint16(ndr, r->name_size)); @@ -49,6 +50,7 @@ done: static NTSTATUS ndr_pull_lsa_Name(struct ndr_pull *ndr, int ndr_flags, struct lsa_Name *r) { uint32 _ptr_name; + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_uint16(ndr, &r->name_len)); NDR_CHECK(ndr_pull_uint16(ndr, &r->name_size)); @@ -84,6 +86,7 @@ void ndr_print_lsa_Name(struct ndr_print *ndr, const char *name, struct lsa_Name static NTSTATUS ndr_pull_lsa_PrivEntry(struct ndr_pull *ndr, int ndr_flags, struct lsa_PrivEntry *r) { + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_lsa_Name(ndr, NDR_SCALARS, &r->name)); NDR_CHECK(ndr_pull_uint32(ndr, &r->luid_low)); @@ -108,6 +111,7 @@ void ndr_print_lsa_PrivEntry(struct ndr_print *ndr, const char *name, struct lsa static NTSTATUS ndr_pull_lsa_PrivArray(struct ndr_pull *ndr, int ndr_flags, struct lsa_PrivArray *r) { uint32 _ptr_privs; + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_uint32(ndr, &r->count)); NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_privs)); @@ -201,8 +205,9 @@ static NTSTATUS ndr_push_lsa_QosInfo(struct ndr_push *ndr, int ndr_flags, struct { struct ndr_push_save _save1, _save2, _save3; ndr_push_save(ndr, &_save1); + NDR_CHECK(ndr_push_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; - NDR_CHECK(ndr_push_align_uint32(ndr)); + NDR_CHECK(ndr_push_align(ndr, sizeof(uint32))); ndr_push_save(ndr, &_save2); NDR_CHECK(ndr_push_uint32(ndr, 0)); NDR_CHECK(ndr_push_uint16(ndr, r->impersonation_level)); @@ -232,8 +237,9 @@ static NTSTATUS ndr_push_lsa_ObjectAttribute(struct ndr_push *ndr, int ndr_flags { struct ndr_push_save _save1, _save2, _save3; ndr_push_save(ndr, &_save1); + NDR_CHECK(ndr_push_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; - NDR_CHECK(ndr_push_align_uint32(ndr)); + NDR_CHECK(ndr_push_align(ndr, sizeof(uint32))); ndr_push_save(ndr, &_save2); NDR_CHECK(ndr_push_uint32(ndr, 0)); NDR_CHECK(ndr_push_ptr(ndr, r->root_dir)); @@ -317,6 +323,7 @@ NTSTATUS ndr_pull_lsa_OpenPolicy(struct ndr_pull *ndr, struct lsa_OpenPolicy *r) static NTSTATUS ndr_pull_lsa_AuditLogInfo(struct ndr_pull *ndr, int ndr_flags, struct lsa_AuditLogInfo *r) { + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_uint32(ndr, &r->percent_full)); NDR_CHECK(ndr_pull_uint32(ndr, &r->log_size)); @@ -347,6 +354,7 @@ void ndr_print_lsa_AuditLogInfo(struct ndr_print *ndr, const char *name, struct static NTSTATUS ndr_pull_lsa_AuditSettings(struct ndr_pull *ndr, int ndr_flags, struct lsa_AuditSettings *r) { + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_uint32(ndr, &r->count)); buffers: @@ -372,6 +380,7 @@ void ndr_print_lsa_AuditSettings(struct ndr_print *ndr, const char *name, struct static NTSTATUS ndr_pull_lsa_AuditEventsInfo(struct ndr_pull *ndr, int ndr_flags, struct lsa_AuditEventsInfo *r) { uint32 _ptr_settings; + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_uint32(ndr, &r->auditing_mode)); NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_settings)); @@ -403,6 +412,42 @@ void ndr_print_lsa_AuditEventsInfo(struct ndr_print *ndr, const char *name, stru ndr->depth--; } +static NTSTATUS ndr_pull_lsa_PrimaryDomainInfo(struct ndr_pull *ndr, int ndr_flags, struct lsa_PrimaryDomainInfo *r) +{ + uint32 _ptr_sid; + NDR_CHECK(ndr_pull_align(ndr, 4)); + if (!(ndr_flags & NDR_SCALARS)) goto buffers; + NDR_CHECK(ndr_pull_lsa_Name(ndr, NDR_SCALARS, &r->name)); + NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_sid)); + if (_ptr_sid) { + NDR_ALLOC(ndr, r->sid); + } else { + r->sid = NULL; + } +buffers: + if (!(ndr_flags & NDR_BUFFERS)) goto done; + NDR_CHECK(ndr_pull_lsa_Name(ndr, ndr_flags, &r->name)); + if (r->sid) { + NDR_CHECK(ndr_pull_dom_sid2(ndr, r->sid)); + } +done: + return NT_STATUS_OK; +} + +void ndr_print_lsa_PrimaryDomainInfo(struct ndr_print *ndr, const char *name, struct lsa_PrimaryDomainInfo *r) +{ + ndr_print_struct(ndr, name, "lsa_PrimaryDomainInfo"); + ndr->depth++; + ndr_print_lsa_Name(ndr, "name", &r->name); + ndr_print_ptr(ndr, "sid", r->sid); + ndr->depth++; + if (r->sid) { + ndr_print_dom_sid2(ndr, "sid", r->sid); + } + ndr->depth--; + ndr->depth--; +} + static NTSTATUS ndr_pull_lsa_PolicyInformation(struct ndr_pull *ndr, int ndr_flags, uint16 *level, union lsa_PolicyInformation *r) { NDR_CHECK(ndr_pull_uint16(ndr, level)); @@ -416,6 +461,10 @@ static NTSTATUS ndr_pull_lsa_PolicyInformation(struct ndr_pull *ndr, int ndr_fla NDR_CHECK(ndr_pull_lsa_AuditEventsInfo(ndr, NDR_SCALARS, &r->audit_events)); break; + case 3: + NDR_CHECK(ndr_pull_lsa_PrimaryDomainInfo(ndr, NDR_SCALARS, &r->domain)); + break; + default: return NT_STATUS_INVALID_LEVEL; } @@ -430,6 +479,10 @@ buffers: NDR_CHECK(ndr_pull_lsa_AuditEventsInfo(ndr, NDR_BUFFERS, &r->audit_events)); break; + case 3: + NDR_CHECK(ndr_pull_lsa_PrimaryDomainInfo(ndr, NDR_BUFFERS, &r->domain)); + break; + default: return NT_STATUS_INVALID_LEVEL; } @@ -449,6 +502,10 @@ void ndr_print_lsa_PolicyInformation(struct ndr_print *ndr, const char *name, ui ndr_print_lsa_AuditEventsInfo(ndr, "audit_events", &r->audit_events); break; + case 3: + ndr_print_lsa_PrimaryDomainInfo(ndr, "domain", &r->domain); + break; + default: ndr_print_bad_level(ndr, name, level); } @@ -523,6 +580,7 @@ NTSTATUS ndr_pull_lsa_CreateAccount(struct ndr_pull *ndr, struct lsa_CreateAccou static NTSTATUS ndr_push_lsa_SidPtr(struct ndr_push *ndr, int ndr_flags, struct lsa_SidPtr *r) { + NDR_CHECK(ndr_push_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_push_ptr(ndr, r->sid)); buffers: @@ -537,6 +595,7 @@ done: static NTSTATUS ndr_pull_lsa_SidPtr(struct ndr_pull *ndr, int ndr_flags, struct lsa_SidPtr *r) { uint32 _ptr_sid; + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_sid)); if (_ptr_sid) { @@ -568,6 +627,7 @@ void ndr_print_lsa_SidPtr(struct ndr_print *ndr, const char *name, struct lsa_Si static NTSTATUS ndr_push_lsa_SidArray(struct ndr_push *ndr, int ndr_flags, struct lsa_SidArray *r) { + NDR_CHECK(ndr_push_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_push_uint32(ndr, r->num_sids)); NDR_CHECK(ndr_push_ptr(ndr, r->sids)); @@ -583,6 +643,7 @@ done: static NTSTATUS ndr_pull_lsa_SidArray(struct ndr_pull *ndr, int ndr_flags, struct lsa_SidArray *r) { uint32 _ptr_sids; + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_uint32(ndr, &r->num_sids)); NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_sids)); @@ -649,6 +710,7 @@ NTSTATUS ndr_pull_lsa_CreateTrustDom(struct ndr_pull *ndr, struct lsa_CreateTrus static NTSTATUS ndr_pull_lsa_DomainInformation(struct ndr_pull *ndr, int ndr_flags, struct lsa_DomainInformation *r) { uint32 _ptr_sid; + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_lsa_Name(ndr, NDR_SCALARS, &r->name)); NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_sid)); @@ -684,6 +746,7 @@ void ndr_print_lsa_DomainInformation(struct ndr_print *ndr, const char *name, st static NTSTATUS ndr_pull_lsa_DomainList(struct ndr_pull *ndr, int ndr_flags, struct lsa_DomainList *r) { uint32 _ptr_domains; + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_uint32(ndr, &r->count)); NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_domains)); @@ -736,6 +799,7 @@ NTSTATUS ndr_pull_lsa_EnumTrustDom(struct ndr_pull *ndr, struct lsa_EnumTrustDom static NTSTATUS ndr_push_lsa_TranslatedSid(struct ndr_push *ndr, int ndr_flags, struct lsa_TranslatedSid *r) { + NDR_CHECK(ndr_push_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_push_uint16(ndr, r->sid_type)); NDR_CHECK(ndr_push_uint32(ndr, r->rid)); @@ -748,6 +812,7 @@ done: static NTSTATUS ndr_pull_lsa_TranslatedSid(struct ndr_pull *ndr, int ndr_flags, struct lsa_TranslatedSid *r) { + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_uint16(ndr, &r->sid_type)); NDR_CHECK(ndr_pull_uint32(ndr, &r->rid)); @@ -770,6 +835,7 @@ void ndr_print_lsa_TranslatedSid(struct ndr_print *ndr, const char *name, struct static NTSTATUS ndr_push_lsa_TransSidArray(struct ndr_push *ndr, int ndr_flags, struct lsa_TransSidArray *r) { + NDR_CHECK(ndr_push_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_push_uint32(ndr, r->count)); NDR_CHECK(ndr_push_ptr(ndr, r->sids)); @@ -785,6 +851,7 @@ done: static NTSTATUS ndr_pull_lsa_TransSidArray(struct ndr_pull *ndr, int ndr_flags, struct lsa_TransSidArray *r) { uint32 _ptr_sids; + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_uint32(ndr, &r->count)); NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_sids)); @@ -820,6 +887,7 @@ void ndr_print_lsa_TransSidArray(struct ndr_print *ndr, const char *name, struct static NTSTATUS ndr_pull_lsa_TrustInformation(struct ndr_pull *ndr, int ndr_flags, struct lsa_TrustInformation *r) { uint32 _ptr_sid; + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_lsa_Name(ndr, NDR_SCALARS, &r->name)); NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_sid)); @@ -855,6 +923,7 @@ void ndr_print_lsa_TrustInformation(struct ndr_print *ndr, const char *name, str static NTSTATUS ndr_pull_lsa_RefDomainList(struct ndr_pull *ndr, int ndr_flags, struct lsa_RefDomainList *r) { uint32 _ptr_domains; + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_uint32(ndr, &r->count)); NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_domains)); @@ -925,6 +994,7 @@ NTSTATUS ndr_pull_lsa_LookupNames(struct ndr_pull *ndr, struct lsa_LookupNames * static NTSTATUS ndr_push_lsa_TranslatedName(struct ndr_push *ndr, int ndr_flags, struct lsa_TranslatedName *r) { + NDR_CHECK(ndr_push_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_push_uint16(ndr, r->sid_type)); NDR_CHECK(ndr_push_lsa_Name(ndr, NDR_SCALARS, &r->name)); @@ -938,6 +1008,7 @@ done: static NTSTATUS ndr_pull_lsa_TranslatedName(struct ndr_pull *ndr, int ndr_flags, struct lsa_TranslatedName *r) { + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_uint16(ndr, &r->sid_type)); NDR_CHECK(ndr_pull_lsa_Name(ndr, NDR_SCALARS, &r->name)); @@ -961,6 +1032,7 @@ void ndr_print_lsa_TranslatedName(struct ndr_print *ndr, const char *name, struc static NTSTATUS ndr_push_lsa_TransNameArray(struct ndr_push *ndr, int ndr_flags, struct lsa_TransNameArray *r) { + NDR_CHECK(ndr_push_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_push_uint32(ndr, r->count)); NDR_CHECK(ndr_push_ptr(ndr, r->names)); @@ -976,6 +1048,7 @@ done: static NTSTATUS ndr_pull_lsa_TransNameArray(struct ndr_pull *ndr, int ndr_flags, struct lsa_TransNameArray *r) { uint32 _ptr_names; + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_uint32(ndr, &r->count)); NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_names)); @@ -1070,6 +1143,7 @@ NTSTATUS ndr_pull_lsa_OpenAccount(struct ndr_pull *ndr, struct lsa_OpenAccount * static NTSTATUS ndr_pull_lsa_LUID(struct ndr_pull *ndr, int ndr_flags, struct lsa_LUID *r) { + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_uint32(ndr, &r->low)); NDR_CHECK(ndr_pull_uint32(ndr, &r->high)); @@ -1090,6 +1164,7 @@ void ndr_print_lsa_LUID(struct ndr_print *ndr, const char *name, struct lsa_LUID static NTSTATUS ndr_pull_lsa_LUIDAttribute(struct ndr_pull *ndr, int ndr_flags, struct lsa_LUIDAttribute *r) { + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_lsa_LUID(ndr, NDR_SCALARS, &r->luid)); NDR_CHECK(ndr_pull_uint32(ndr, &r->attribute)); @@ -1111,6 +1186,7 @@ void ndr_print_lsa_LUIDAttribute(struct ndr_print *ndr, const char *name, struct static NTSTATUS ndr_pull_lsa_PrivilegeSet(struct ndr_pull *ndr, int ndr_flags, struct lsa_PrivilegeSet *r) { + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_uint32(ndr, &r->count)); buffers: @@ -1408,6 +1484,7 @@ void ndr_print_lsa_RightAttribute(struct ndr_print *ndr, const char *name, struc static NTSTATUS ndr_pull_lsa_RightSet(struct ndr_pull *ndr, int ndr_flags, struct lsa_RightSet *r) { uint32 _ptr_names; + NDR_CHECK(ndr_pull_align(ndr, 4)); if (!(ndr_flags & NDR_SCALARS)) goto buffers; NDR_CHECK(ndr_pull_uint32(ndr, &r->count)); NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_names)); diff --git a/source4/librpc/ndr/ndr_lsa.h b/source4/librpc/ndr/ndr_lsa.h index 3ef03516ae2..21060b60589 100644 --- a/source4/librpc/ndr/ndr_lsa.h +++ b/source4/librpc/ndr/ndr_lsa.h @@ -133,9 +133,15 @@ struct lsa_AuditEventsInfo { struct lsa_AuditSettings *settings; }; +struct lsa_PrimaryDomainInfo { + struct lsa_Name name; + struct dom_sid2 *sid; +}; + union lsa_PolicyInformation { /* [case(1)] */ struct lsa_AuditLogInfo audit_log; /* [case(2)] */ struct lsa_AuditEventsInfo audit_events; +/* [case(3)] */ struct lsa_PrimaryDomainInfo domain; }; struct lsa_QueryInfoPolicy { diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c index e3b3a2ae8d1..9d0177edfa3 100644 --- a/source4/torture/rpc/lsa.c +++ b/source4/torture/rpc/lsa.c @@ -501,6 +501,8 @@ static BOOL test_QueryInfoPolicy(struct dcerpc_pipe *p, r.in.handle = handle; r.in.level = i; + printf("\ntrying QueryInfoPolicy level %d\n", i); + status = dcerpc_lsa_QueryInfoPolicy(p, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { printf("QueryInfoPolicy failed - %s\n", nt_errstr(status));