- corrected some lsa idl

- updated lsa parse code from pidl
(This used to be commit 3983b2aee77b0e093847bfc02e02b83ab281f5dd)

1 files changed, 241 insertions, 78 deletions

diff --git a/source4/librpc/ndr/ndr_lsa.c b/source4/librpc/ndr/ndr_lsa.c
index bde450687e..ff395f5699 100644
--- a/source4/librpc/ndr/ndr_lsa.c
+++ b/source4/librpc/ndr/ndr_lsa.c
@@ -23,95 +23,63 @@
 
 #include "includes.h"
 
-/*
-  parse a openpolicy
-*/
-NTSTATUS ndr_pull_lsa_OpenPolicy(struct ndr_pull *ndr,
-				 struct lsa_OpenPolicy *r)
-{
-	NDR_ALLOC(ndr, r->out.handle);
-	NDR_CHECK(ndr_pull_policy_handle(ndr, r->out.handle));
-	NDR_CHECK(ndr_pull_status(ndr, &r->out.result));
-	return NT_STATUS_OK;
-}
-
-/*
-  parse a openpolicy2
-*/
-NTSTATUS ndr_pull_lsa_OpenPolicy2(struct ndr_pull *ndr,
-				 struct lsa_OpenPolicy2 *r)
-{
-	NDR_ALLOC(ndr, r->out.handle);
-	NDR_CHECK(ndr_pull_policy_handle(ndr, r->out.handle));
-	NDR_CHECK(ndr_pull_status(ndr, &r->out.result));
-	return NT_STATUS_OK;
-}
-
-
-/*
-  pull a EnumSids
-*/
-NTSTATUS ndr_pull_lsa_EnumSids(struct ndr_pull *ndr, 
-			       struct lsa_EnumSids *r)
-{
-	uint32 nptrs, asize, i, ptr;
-
-	NDR_CHECK(ndr_pull_uint32(ndr, &r->out.num_entries));
-	NDR_CHECK(ndr_pull_uint32(ndr, &nptrs));
-	NDR_CHECK(ndr_pull_uint32(ndr, &ptr));
-	if (!ptr) goto done;
-
-	NDR_CHECK(ndr_pull_uint32(ndr, &asize));
-	NDR_ALLOC_N(ndr, r->out.sids, nptrs);
-	for (i=0;i<nptrs;i++) {
-		NDR_CHECK(ndr_pull_uint32(ndr, &ptr));
-		if (ptr) {
-			NDR_ALLOC(ndr, r->out.sids[i]);
-		} else {
-			r->out.sids[i] = NULL;
-		}
-	}
-	for (i=0;i<nptrs;i++) {
-		if (r->out.sids[i]) NDR_CHECK(ndr_pull_dom_sid2(ndr, r->out.sids[i]));
-	}
-
-done:
-	NDR_CHECK(ndr_pull_status(ndr, &r->out.result));
-	return NT_STATUS_OK;
-}
-
-
 /* parser auto-generated by pidl */
 
-static NTSTATUS ndr_push_lsa_QosInfo(struct ndr_push *ndr, struct lsa_QosInfo *r)
+static NTSTATUS ndr_push_lsa_QosInfo(struct ndr_push *ndr, int ndr_flags, struct lsa_QosInfo *r)
 {
-	struct ndr_push_save len_save1, len_save2, len_save3;
-	ndr_push_save(ndr, &len_save1);
+	struct ndr_push_save _save1, _save2, _save3;
+	ndr_push_save(ndr, &_save1);
+	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
 	NDR_CHECK(ndr_push_align_uint32(ndr));
-	ndr_push_save(ndr, &len_save2);
+	ndr_push_save(ndr, &_save2);
 	NDR_CHECK(ndr_push_uint32(ndr, 0));
 	NDR_CHECK(ndr_push_uint16(ndr, r->impersonation_level));
 	NDR_CHECK(ndr_push_uint8(ndr, r->context_mode));
 	NDR_CHECK(ndr_push_uint8(ndr, r->effective_only));
-	ndr_push_save(ndr, &len_save3);
-	ndr_push_restore(ndr, &len_save2);
-	NDR_CHECK(ndr_push_uint32(ndr, len_save3.offset - len_save1.offset));
-	ndr_push_restore(ndr, &len_save3);
+buffers:
+	if (!(ndr_flags & NDR_BUFFERS)) goto done;
+	ndr_push_save(ndr, &_save3);
+	ndr_push_restore(ndr, &_save2);
+	NDR_CHECK(ndr_push_uint32(ndr, _save3.offset - _save1.offset));
+	ndr_push_restore(ndr, &_save3);
+done:
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ndr_push_lsa_ObjectAttribute(struct ndr_push *ndr, struct lsa_ObjectAttribute *r)
+static NTSTATUS ndr_pull_lsa_QosInfo(struct ndr_pull *ndr, int ndr_flags, struct lsa_QosInfo *r)
 {
-	struct ndr_push_save len_save1, len_save2, len_save3;
-	ndr_push_save(ndr, &len_save1);
+	uint32 _size;
+	struct ndr_pull_save _save;
+	ndr_pull_save(ndr, &_save);
+	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
+	NDR_CHECK(ndr_pull_uint32(ndr, &_size));
+	NDR_CHECK(ndr_pull_limit_size(ndr, _size, 4));
+	NDR_CHECK(ndr_pull_uint16(ndr, &r->impersonation_level));
+	NDR_CHECK(ndr_pull_uint8(ndr, &r->context_mode));
+	NDR_CHECK(ndr_pull_uint8(ndr, &r->effective_only));
+buffers:
+	if (!(ndr_flags & NDR_BUFFERS)) goto done;
+	ndr_pull_restore(ndr, &_save);
+	NDR_CHECK(ndr_pull_advance(ndr, _size));
+done:
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS ndr_push_lsa_ObjectAttribute(struct ndr_push *ndr, int ndr_flags, struct lsa_ObjectAttribute *r)
+{
+	struct ndr_push_save _save1, _save2, _save3;
+	ndr_push_save(ndr, &_save1);
+	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
 	NDR_CHECK(ndr_push_align_uint32(ndr));
-	ndr_push_save(ndr, &len_save2);
+	ndr_push_save(ndr, &_save2);
 	NDR_CHECK(ndr_push_uint32(ndr, 0));
 	NDR_CHECK(ndr_push_ptr(ndr, r->root_dir));
 	NDR_CHECK(ndr_push_ptr(ndr, r->object_name));
 	NDR_CHECK(ndr_push_uint32(ndr, r->attributes));
 	NDR_CHECK(ndr_push_ptr(ndr, r->sec_desc));
 	NDR_CHECK(ndr_push_ptr(ndr, r->sec_qos));
+buffers:
+	if (!(ndr_flags & NDR_BUFFERS)) goto done;
 	if (r->root_dir) {
 		NDR_CHECK(ndr_push_uint8(ndr, *r->root_dir));
 	}
@@ -122,12 +90,70 @@ static NTSTATUS ndr_push_lsa_ObjectAttribute(struct ndr_push *ndr, struct lsa_Ob
 		NDR_CHECK(ndr_push_security_descriptor(ndr, r->sec_desc));
 	}
 	if (r->sec_qos) {
-		NDR_CHECK(ndr_push_lsa_QosInfo(ndr, r->sec_qos));
+		NDR_CHECK(ndr_push_lsa_QosInfo(ndr, ndr_flags, r->sec_qos));
 	}
-	ndr_push_save(ndr, &len_save3);
-	ndr_push_restore(ndr, &len_save2);
-	NDR_CHECK(ndr_push_uint32(ndr, len_save3.offset - len_save1.offset));
-	ndr_push_restore(ndr, &len_save3);
+	ndr_push_save(ndr, &_save3);
+	ndr_push_restore(ndr, &_save2);
+	NDR_CHECK(ndr_push_uint32(ndr, _save3.offset - _save1.offset));
+	ndr_push_restore(ndr, &_save3);
+done:
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS ndr_pull_lsa_ObjectAttribute(struct ndr_pull *ndr, int ndr_flags, struct lsa_ObjectAttribute *r)
+{
+	uint32 _ptr_root_dir;
+	uint32 _ptr_object_name;
+	uint32 _ptr_sec_desc;
+	uint32 _ptr_sec_qos;
+	uint32 _size;
+	struct ndr_pull_save _save;
+	ndr_pull_save(ndr, &_save);
+	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
+	NDR_CHECK(ndr_pull_uint32(ndr, &_size));
+	NDR_CHECK(ndr_pull_limit_size(ndr, _size, 4));
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_root_dir));
+	if (_ptr_root_dir) {
+		NDR_ALLOC(ndr, r->root_dir);
+	} else {
+		r->root_dir = NULL;
+	}
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_object_name));
+	if (_ptr_object_name) {
+		NDR_ALLOC(ndr, r->object_name);
+	} else {
+		r->object_name = NULL;
+	}
+	NDR_CHECK(ndr_pull_uint32(ndr, &r->attributes));
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_sec_desc));
+	if (_ptr_sec_desc) {
+		NDR_ALLOC(ndr, r->sec_desc);
+	} else {
+		r->sec_desc = NULL;
+	}
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_sec_qos));
+	if (_ptr_sec_qos) {
+		NDR_ALLOC(ndr, r->sec_qos);
+	} else {
+		r->sec_qos = NULL;
+	}
+buffers:
+	if (!(ndr_flags & NDR_BUFFERS)) goto done;
+	if (r->root_dir) {
+		NDR_CHECK(ndr_pull_uint8(ndr, r->root_dir));
+	}
+	if (r->object_name) {
+		NDR_CHECK(ndr_pull_unistr(ndr, &r->object_name));
+	}
+	if (r->sec_desc) {
+		NDR_CHECK(ndr_pull_security_descriptor(ndr, r->sec_desc));
+	}
+	if (r->sec_qos) {
+		NDR_CHECK(ndr_pull_lsa_QosInfo(ndr, ndr_flags, r->sec_qos));
+	}
+	ndr_pull_restore(ndr, &_save);
+	NDR_CHECK(ndr_pull_advance(ndr, _size));
+done:
 	return NT_STATUS_OK;
 }
 
@@ -137,7 +163,7 @@ NTSTATUS ndr_push_lsa_OpenPolicy(struct ndr_push *ndr, struct lsa_OpenPolicy *r)
 	if (r->in.system_name) {
 		NDR_CHECK(ndr_push_uint16(ndr, *r->in.system_name));
 	}
-	NDR_CHECK(ndr_push_lsa_ObjectAttribute(ndr, r->in.attr));
+	NDR_CHECK(ndr_push_lsa_ObjectAttribute(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.attr));
 	NDR_CHECK(ndr_push_uint32(ndr, r->in.desired_access));
 
 	return NT_STATUS_OK;
@@ -149,19 +175,156 @@ NTSTATUS ndr_push_lsa_OpenPolicy2(struct ndr_push *ndr, struct lsa_OpenPolicy2 *
 	if (r->in.system_name) {
 		NDR_CHECK(ndr_push_unistr(ndr, r->in.system_name));
 	}
-	NDR_CHECK(ndr_push_lsa_ObjectAttribute(ndr, r->in.attr));
+	NDR_CHECK(ndr_push_lsa_ObjectAttribute(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.attr));
 	NDR_CHECK(ndr_push_uint32(ndr, r->in.desired_access));
 
 	return NT_STATUS_OK;
 }
 
+static NTSTATUS ndr_push_lsa_SidPtr(struct ndr_push *ndr, int ndr_flags, struct lsa_SidPtr *r)
+{
+	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
+	NDR_CHECK(ndr_push_ptr(ndr, r->sid));
+buffers:
+	if (!(ndr_flags & NDR_BUFFERS)) goto done;
+	if (r->sid) {
+		NDR_CHECK(ndr_push_dom_sid2(ndr, r->sid));
+	}
+done:
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS ndr_pull_lsa_SidPtr(struct ndr_pull *ndr, int ndr_flags, struct lsa_SidPtr *r)
+{
+	uint32 _ptr_sid;
+	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
+	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;
+	if (r->sid) {
+		NDR_CHECK(ndr_pull_dom_sid2(ndr, r->sid));
+	}
+done:
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS ndr_push_lsa_SidArray(struct ndr_push *ndr, int ndr_flags, struct lsa_SidArray *r)
+{
+	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
+	NDR_CHECK(ndr_push_uint32(ndr, r->num_sids));
+	NDR_CHECK(ndr_push_ptr(ndr, r->sids));
+buffers:
+	if (!(ndr_flags & NDR_BUFFERS)) goto done;
+	if (r->sids) {
+		NDR_CHECK(ndr_push_array(ndr, ndr_flags, r->sids, sizeof(r->sids[0]), r->num_sids, (ndr_push_flags_fn_t)ndr_push_lsa_SidPtr));
+	}
+done:
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS ndr_pull_lsa_SidArray(struct ndr_pull *ndr, int ndr_flags, struct lsa_SidArray *r)
+{
+	uint32 _ptr_sids;
+	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
+	NDR_CHECK(ndr_pull_uint32(ndr, &r->num_sids));
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_sids));
+	if (_ptr_sids) {
+		NDR_ALLOC(ndr, r->sids);
+	} else {
+		r->sids = NULL;
+	}
+buffers:
+	if (!(ndr_flags & NDR_BUFFERS)) goto done;
+	if (r->sids) {
+		NDR_CHECK(ndr_pull_array(ndr, ndr_flags, (void **)&r->sids, sizeof(r->sids[0]), r->num_sids, (ndr_pull_flags_fn_t)ndr_pull_lsa_SidPtr));
+	}
+done:
+	return NT_STATUS_OK;
+}
+
 NTSTATUS ndr_push_lsa_EnumSids(struct ndr_push *ndr, struct lsa_EnumSids *r)
 {
 	NDR_CHECK(ndr_push_policy_handle(ndr, r->in.handle));
-	NDR_CHECK(ndr_push_uint32(ndr, r->in.start_at));
+	NDR_CHECK(ndr_push_uint32(ndr, r->in.resume_handle));
 	NDR_CHECK(ndr_push_uint32(ndr, r->in.num_entries));
 
 	return NT_STATUS_OK;
 }
 
+/*
+  parse a openpolicy
+*/
+NTSTATUS ndr_pull_lsa_OpenPolicy(struct ndr_pull *ndr,
+				 struct lsa_OpenPolicy *r)
+{
+	NDR_ALLOC(ndr, r->out.handle);
+	NDR_CHECK(ndr_pull_policy_handle(ndr, r->out.handle));
+	NDR_CHECK(ndr_pull_status(ndr, &r->out.result));
+	return NT_STATUS_OK;
+}
+
+/*
+  parse a openpolicy2
+*/
+NTSTATUS ndr_pull_lsa_OpenPolicy2(struct ndr_pull *ndr,
+				 struct lsa_OpenPolicy2 *r)
+{
+	NDR_ALLOC(ndr, r->out.handle);
+	NDR_CHECK(ndr_pull_policy_handle(ndr, r->out.handle));
+	NDR_CHECK(ndr_pull_status(ndr, &r->out.result));
+	return NT_STATUS_OK;
+}
+
+#if 0
+/*
+  pull a lsa_SidArray
+*/
+static NTSTATUS ndr_pull_lsa_SidArray(struct ndr_pull *ndr, 
+			       struct lsa_SidArray *r)
+{
+	uint32 ptr;
+
+	NDR_CHECK(ndr_pull_uint32(ndr, &r->num_sids));
+	NDR_CHECK(ndr_pull_uint32(ndr, &ptr));
+	if (ptr) {
+		uint32 asize, i;
+
+		NDR_CHECK(ndr_pull_uint32(ndr, &asize));
+		NDR_ALLOC_N(ndr, r->sids, asize);
+		for (i=0;i<asize;i++) {
+			NDR_CHECK(ndr_pull_uint32(ndr, &ptr));
+			if (ptr) {
+				NDR_ALLOC(ndr, r->sids[i]);
+			} else {
+				r->sids[i] = NULL;
+			}
+		}
+
+		for (i=0;i<asize;i++) {
+			if (r->sids[i]) {
+				NDR_CHECK(ndr_pull_dom_sid2(ndr, r->sids[i]));
+			}
+		}
+	}
+	return NT_STATUS_OK;
+}
+#endif
+
+/*
+  pull a EnumSids
+*/
+NTSTATUS ndr_pull_lsa_EnumSids(struct ndr_pull *ndr, 
+			       struct lsa_EnumSids *r)
+{
+	NDR_CHECK(ndr_pull_uint32(ndr, &r->out.resume_handle));
+	NDR_ALLOC(ndr, r->out.sids);
+	NDR_CHECK(ndr_pull_lsa_SidArray(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sids));
+	NDR_CHECK(ndr_pull_status(ndr, &r->out.result));
+	return NT_STATUS_OK;
+}