started adding support for lsa_QueryInfoPolicy

(This used to be commit 5b2d577969103ed5c633ea993d476787af14fa93)

6 files changed, 179 insertions, 244 deletions

diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl
index d2410e770d..93cae36ae0 100644
--- a/source4/librpc/idl/lsa.idl
+++ b/source4/librpc/idl/lsa.idl
@@ -95,7 +95,31 @@
 
 	/******************/
 	/* Function: 0x07 */
-	NTSTATUS lsa_QueryInfoPolicy ();
+
+	typedef struct {
+		uint32 percent_full;
+		uint32 log_size;
+		NTTIME retention_time;
+		uint8  shutdown_in_progress;
+		NTTIME time_to_shutdown;
+		uint32 next_audit_record;
+		uint32 unknown;
+	} lsa_AuditLogInfo;
+
+	typedef struct {
+		uint32 auditing_mode;
+	} lsa_AuditEventsInfo;
+
+	typedef union {
+		case(1) lsa_AuditLogInfo audit_log;
+		case(2) lsa_AuditEventsInfo audit_events;
+	} lsa_PolicyInformation;
+
+	NTSTATUS lsa_QueryInfoPolicy (
+		[in,ref]                 policy_handle *handle,
+		[in]                     uint16 level,
+		[out,switch_is(level)]   lsa_PolicyInformation *info
+		);
 
 	/******************/
 	/* Function:       0x08 */
diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c
index b8c0cffd6d..b6c5a0cd53 100644
--- a/source4/librpc/ndr/ndr_basic.c
+++ b/source4/librpc/ndr/ndr_basic.c
@@ -353,3 +353,23 @@ NTSTATUS ndr_push_guid(struct ndr_push *ndr, GUID *guid)
 {
 	return ndr_push_bytes(ndr, guid->info, GUID_SIZE);
 }
+
+/*
+  push a NTTIME
+*/
+NTSTATUS ndr_push_NTTIME(struct ndr_push *ndr, NTTIME t)
+{
+	NDR_CHECK(ndr_push_uint32(ndr, t.low));
+	NDR_CHECK(ndr_push_uint32(ndr, t.high));
+	return NT_STATUS_OK;
+}
+
+/*
+  pull a NTTIME
+*/
+NTSTATUS ndr_pull_NTTIME(struct ndr_pull *ndr, NTTIME *t)
+{
+	NDR_CHECK(ndr_pull_uint32(ndr, &t->low));
+	NDR_CHECK(ndr_pull_uint32(ndr, &t->high));
+	return NT_STATUS_OK;
+}
diff --git a/source4/librpc/ndr/ndr_lsa.c b/source4/librpc/ndr/ndr_lsa.c
index 33596bf659..2a2d5a5c03 100644
--- a/source4/librpc/ndr/ndr_lsa.c
+++ b/source4/librpc/ndr/ndr_lsa.c
@@ -67,19 +67,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ndr_push_lsa_PrivEntry(struct ndr_push *ndr, int ndr_flags, struct lsa_PrivEntry *r)
-{
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_push_lsa_Name(ndr, NDR_SCALARS, &r->name));
-	NDR_CHECK(ndr_push_uint32(ndr, r->luid_low));
-	NDR_CHECK(ndr_push_uint32(ndr, r->luid_high));
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-		NDR_CHECK(ndr_push_lsa_Name(ndr, ndr_flags, &r->name));
-done:
-	return NT_STATUS_OK;
-}
-
 static NTSTATUS ndr_pull_lsa_PrivEntry(struct ndr_pull *ndr, int ndr_flags, struct lsa_PrivEntry *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
@@ -93,20 +80,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ndr_push_lsa_PrivArray(struct ndr_push *ndr, int ndr_flags, struct lsa_PrivArray *r)
-{
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_push_uint32(ndr, r->count));
-	NDR_CHECK(ndr_push_ptr(ndr, r->privs));
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-	if (r->privs) {
-		NDR_CHECK(ndr_push_array(ndr, ndr_flags, r->privs, sizeof(r->privs[0]), r->count, (ndr_push_flags_fn_t)ndr_push_lsa_PrivEntry));
-	}
-done:
-	return NT_STATUS_OK;
-}
-
 static NTSTATUS ndr_pull_lsa_PrivArray(struct ndr_pull *ndr, int ndr_flags, struct lsa_PrivArray *r)
 {
 	uint32 _ptr_privs;
@@ -206,25 +179,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ndr_pull_lsa_QosInfo(struct ndr_pull *ndr, int ndr_flags, struct lsa_QosInfo *r)
-{
-	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;
@@ -260,63 +214,6 @@ 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;
-}
-
 NTSTATUS ndr_push_lsa_OpenPolicy(struct ndr_push *ndr, struct lsa_OpenPolicy *r)
 {
 	NDR_CHECK(ndr_push_ptr(ndr, r->in.system_name));
@@ -337,14 +234,89 @@ NTSTATUS ndr_pull_lsa_OpenPolicy(struct ndr_pull *ndr, struct lsa_OpenPolicy *r)
 	return NT_STATUS_OK;
 }
 
+static NTSTATUS ndr_pull_lsa_AuditLogInfo(struct ndr_pull *ndr, int ndr_flags, struct lsa_AuditLogInfo *r)
+{
+	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));
+	NDR_CHECK(ndr_pull_NTTIME(ndr, &r->retention_time));
+	NDR_CHECK(ndr_pull_uint8(ndr, &r->shutdown_in_progress));
+	NDR_CHECK(ndr_pull_NTTIME(ndr, &r->time_to_shutdown));
+	NDR_CHECK(ndr_pull_uint32(ndr, &r->next_audit_record));
+	NDR_CHECK(ndr_pull_uint32(ndr, &r->unknown));
+buffers:
+	if (!(ndr_flags & NDR_BUFFERS)) goto done;
+done:
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS ndr_pull_lsa_AuditEventsInfo(struct ndr_pull *ndr, int ndr_flags, struct lsa_AuditEventsInfo *r)
+{
+	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
+	NDR_CHECK(ndr_pull_uint32(ndr, &r->auditing_mode));
+buffers:
+	if (!(ndr_flags & NDR_BUFFERS)) goto done;
+done:
+	return NT_STATUS_OK;
+}
+
+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));
+	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
+	switch (*level) {
+	case 1:
+	NDR_CHECK(ndr_pull_lsa_AuditLogInfo(ndr, NDR_SCALARS, &r->audit_log));
+	break;
+
+	case 2:
+	NDR_CHECK(ndr_pull_lsa_AuditEventsInfo(ndr, NDR_SCALARS, &r->audit_events));
+	break;
+
+	default:
+		return NT_STATUS_INVALID_LEVEL;
+	}
+buffers:
+	if (!(ndr_flags & NDR_BUFFERS)) goto done;
+	switch (*level) {
+	case 1:
+		NDR_CHECK(ndr_pull_lsa_AuditLogInfo(ndr, NDR_BUFFERS, &r->audit_log));
+	break;
+
+	case 2:
+		NDR_CHECK(ndr_pull_lsa_AuditEventsInfo(ndr, NDR_BUFFERS, &r->audit_events));
+	break;
+
+	default:
+		return NT_STATUS_INVALID_LEVEL;
+	}
+done:
+	return NT_STATUS_OK;
+}
+
 NTSTATUS ndr_push_lsa_QueryInfoPolicy(struct ndr_push *ndr, struct lsa_QueryInfoPolicy *r)
 {
+	NDR_CHECK(ndr_push_policy_handle(ndr, r->in.handle));
+	NDR_CHECK(ndr_push_uint16(ndr, r->in.level));
 
 	return NT_STATUS_OK;
 }
 
 NTSTATUS ndr_pull_lsa_QueryInfoPolicy(struct ndr_pull *ndr, struct lsa_QueryInfoPolicy *r)
 {
+	uint32 _ptr_info;
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_info));
+	if (_ptr_info) {
+		NDR_ALLOC(ndr, r->out.info);
+	} else {
+		r->out.info = NULL;
+	}
+	if (r->out.info) {
+	{ uint16 _level;
+	NDR_CHECK(ndr_pull_lsa_PolicyInformation(ndr, NDR_SCALARS|NDR_BUFFERS, &_level, r->out.info));
+	if (_level != r->in.level) return NT_STATUS_INVALID_LEVEL;
+	}
+	}
 	NDR_CHECK(ndr_pull_NTSTATUS(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
@@ -487,21 +459,6 @@ NTSTATUS ndr_pull_lsa_CreateTrustDom(struct ndr_pull *ndr, struct lsa_CreateTrus
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ndr_push_lsa_DomainInformation(struct ndr_push *ndr, int ndr_flags, struct lsa_DomainInformation *r)
-{
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_push_lsa_Name(ndr, NDR_SCALARS, &r->name));
-	NDR_CHECK(ndr_push_ptr(ndr, r->sid));
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-		NDR_CHECK(ndr_push_lsa_Name(ndr, ndr_flags, &r->name));
-	if (r->sid) {
-		NDR_CHECK(ndr_push_dom_sid2(ndr, r->sid));
-	}
-done:
-	return NT_STATUS_OK;
-}
-
 static NTSTATUS ndr_pull_lsa_DomainInformation(struct ndr_pull *ndr, int ndr_flags, struct lsa_DomainInformation *r)
 {
 	uint32 _ptr_sid;
@@ -523,20 +480,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ndr_push_lsa_DomainList(struct ndr_push *ndr, int ndr_flags, struct lsa_DomainList *r)
-{
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_push_uint32(ndr, r->count));
-	NDR_CHECK(ndr_push_ptr(ndr, r->domains));
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-	if (r->domains) {
-		NDR_CHECK(ndr_push_array(ndr, ndr_flags, r->domains, sizeof(r->domains[0]), r->count, (ndr_push_flags_fn_t)ndr_push_lsa_DomainInformation));
-	}
-done:
-	return NT_STATUS_OK;
-}
-
 static NTSTATUS ndr_pull_lsa_DomainList(struct ndr_pull *ndr, int ndr_flags, struct lsa_DomainList *r)
 {
 	uint32 _ptr_domains;
@@ -635,21 +578,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ndr_push_lsa_TrustInformation(struct ndr_push *ndr, int ndr_flags, struct lsa_TrustInformation *r)
-{
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_push_lsa_Name(ndr, NDR_SCALARS, &r->name));
-	NDR_CHECK(ndr_push_ptr(ndr, r->sid));
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-		NDR_CHECK(ndr_push_lsa_Name(ndr, ndr_flags, &r->name));
-	if (r->sid) {
-		NDR_CHECK(ndr_push_dom_sid2(ndr, r->sid));
-	}
-done:
-	return NT_STATUS_OK;
-}
-
 static NTSTATUS ndr_pull_lsa_TrustInformation(struct ndr_pull *ndr, int ndr_flags, struct lsa_TrustInformation *r)
 {
 	uint32 _ptr_sid;
@@ -671,21 +599,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ndr_push_lsa_RefDomainList(struct ndr_push *ndr, int ndr_flags, struct lsa_RefDomainList *r)
-{
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_push_uint32(ndr, r->count));
-	NDR_CHECK(ndr_push_ptr(ndr, r->domains));
-	NDR_CHECK(ndr_push_uint32(ndr, r->max_count));
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-	if (r->domains) {
-		NDR_CHECK(ndr_push_array(ndr, ndr_flags, r->domains, sizeof(r->domains[0]), r->count, (ndr_push_flags_fn_t)ndr_push_lsa_TrustInformation));
-	}
-done:
-	return NT_STATUS_OK;
-}
-
 static NTSTATUS ndr_pull_lsa_RefDomainList(struct ndr_pull *ndr, int ndr_flags, struct lsa_RefDomainList *r)
 {
 	uint32 _ptr_domains;
@@ -863,17 +776,6 @@ NTSTATUS ndr_pull_lsa_OpenAccount(struct ndr_pull *ndr, struct lsa_OpenAccount *
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ndr_push_lsa_LUID(struct ndr_push *ndr, int ndr_flags, struct lsa_LUID *r)
-{
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_push_uint32(ndr, r->low));
-	NDR_CHECK(ndr_push_uint32(ndr, r->high));
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-done:
-	return NT_STATUS_OK;
-}
-
 static NTSTATUS ndr_pull_lsa_LUID(struct ndr_pull *ndr, int ndr_flags, struct lsa_LUID *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
@@ -885,18 +787,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ndr_push_lsa_LUIDAttribute(struct ndr_push *ndr, int ndr_flags, struct lsa_LUIDAttribute *r)
-{
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_push_lsa_LUID(ndr, NDR_SCALARS, &r->luid));
-	NDR_CHECK(ndr_push_uint32(ndr, r->attribute));
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-		NDR_CHECK(ndr_push_lsa_LUID(ndr, ndr_flags, &r->luid));
-done:
-	return NT_STATUS_OK;
-}
-
 static NTSTATUS ndr_pull_lsa_LUIDAttribute(struct ndr_pull *ndr, int ndr_flags, struct lsa_LUIDAttribute *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
@@ -909,18 +799,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ndr_push_lsa_PrivilegeSet(struct ndr_push *ndr, int ndr_flags, struct lsa_PrivilegeSet *r)
-{
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_push_uint32(ndr, r->count));
-	NDR_CHECK(ndr_push_lsa_LUIDAttribute(ndr, NDR_SCALARS, r->set));
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-		NDR_CHECK(ndr_push_array(ndr, ndr_flags, r->set, sizeof(r->set[0]), r->count, (ndr_push_flags_fn_t)ndr_push_lsa_LUIDAttribute));
-done:
-	return NT_STATUS_OK;
-}
-
 static NTSTATUS ndr_pull_lsa_PrivilegeSet(struct ndr_pull *ndr, int ndr_flags, struct lsa_PrivilegeSet *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
@@ -1192,52 +1070,6 @@ NTSTATUS ndr_pull_ENUMACCTWITHRIGHT(struct ndr_pull *ndr, struct ENUMACCTWITHRIG
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ndr_push_lsa_RightAttribute(struct ndr_push *ndr, int ndr_flags, struct lsa_RightAttribute *r)
-{
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_push_ptr(ndr, r->name));
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-	if (r->name) {
-		NDR_CHECK(ndr_push_unistr(ndr, r->name));
-	}
-done:
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS ndr_pull_lsa_RightAttribute(struct ndr_pull *ndr, int ndr_flags, struct lsa_RightAttribute *r)
-{
-	uint32 _ptr_name;
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_name));
-	if (_ptr_name) {
-		NDR_ALLOC(ndr, r->name);
-	} else {
-		r->name = NULL;
-	}
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-	if (r->name) {
-		NDR_CHECK(ndr_pull_unistr(ndr, &r->name));
-	}
-done:
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS ndr_push_lsa_RightSet(struct ndr_push *ndr, int ndr_flags, struct lsa_RightSet *r)
-{
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_push_uint32(ndr, r->count));
-	NDR_CHECK(ndr_push_ptr(ndr, r->names));
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-	if (r->names) {
-		NDR_CHECK(ndr_push_array(ndr, ndr_flags, r->names, sizeof(r->names[0]), r->count, (ndr_push_flags_fn_t)ndr_push_lsa_Name));
-	}
-done:
-	return NT_STATUS_OK;
-}
-
 static NTSTATUS ndr_pull_lsa_RightSet(struct ndr_pull *ndr, int ndr_flags, struct lsa_RightSet *r)
 {
 	uint32 _ptr_names;
diff --git a/source4/librpc/ndr/ndr_lsa.h b/source4/librpc/ndr/ndr_lsa.h
index 402bbe8ca2..6eee70fb60 100644
--- a/source4/librpc/ndr/ndr_lsa.h
+++ b/source4/librpc/ndr/ndr_lsa.h
@@ -113,11 +113,33 @@ struct lsa_OpenPolicy {
 
 };
 
+struct lsa_AuditLogInfo {
+	uint32 percent_full;
+	uint32 log_size;
+	NTTIME retention_time;
+	uint8 shutdown_in_progress;
+	NTTIME time_to_shutdown;
+	uint32 next_audit_record;
+	uint32 unknown;
+};
+
+struct lsa_AuditEventsInfo {
+	uint32 auditing_mode;
+};
+
+union lsa_PolicyInformation {
+/* [case(1)] */ struct lsa_AuditLogInfo audit_log;
+/* [case(2)] */ struct lsa_AuditEventsInfo audit_events;
+};
+
 struct lsa_QueryInfoPolicy {
 	struct {
+		struct policy_handle *handle;
+		uint16 level;
 	} in;
 
 	struct {
+		union lsa_PolicyInformation *info;
 		NTSTATUS result;
 	} out;
 
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 682735c000..97aa466e3a 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -800,6 +800,8 @@ NTSTATUS dcerpc_ndr_request(struct dcerpc_pipe *p,
 
 	if (pull->offset != pull->data_size) {
 		DEBUG(0,("Warning! %d unread bytes\n", pull->data_size - pull->offset));
+		status = NT_STATUS_INFO_LENGTH_MISMATCH;
+		goto failed;
 	}
 
 failed:
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 8dd18042f0..ca8c25bdd6 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -528,6 +528,37 @@ static BOOL test_EnumTrustDom(struct dcerpc_pipe *p,
 	return True;
 }
 
+static BOOL test_QueryInfoPolicy(struct dcerpc_pipe *p, 
+				 TALLOC_CTX *mem_ctx, 
+				 struct policy_handle *handle)
+{
+	struct lsa_QueryInfoPolicy r;
+	NTSTATUS status;
+
+	printf("\nTesting QueryInfoPolicy\n");
+
+	r.in.handle = handle;
+	r.in.level = 1;
+
+	status = dcerpc_lsa_QueryInfoPolicy(p, mem_ctx, &r);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("QueryInfoPolicy failed - %s\n", nt_errstr(status));
+		return False;
+	}
+
+	{
+		struct lsa_AuditLogInfo *u = &r.out.info->audit_log;
+		printf("percent_full=%d log_size=%d retention_time=%s\n", 
+		       u->percent_full, u->log_size, 
+		       nt_time_string(mem_ctx, &u->retention_time));
+		printf("shutdown_in_progress=%d time_to_shutdown=%s next_audit_record=%d unknown=0x%x\n", 
+		       u->shutdown_in_progress, nt_time_string(mem_ctx, &u->time_to_shutdown),
+		       u->next_audit_record, u->unknown);
+	}
+
+	return True;
+}
+
 static BOOL test_Delete(struct dcerpc_pipe *p, 
 		       TALLOC_CTX *mem_ctx, 
 		       struct policy_handle *handle)
@@ -614,6 +645,10 @@ BOOL torture_rpc_lsa(int dummy)
 	if (!test_EnumTrustDom(p, mem_ctx, &handle)) {
 		ret = False;
 	}
+
+	if (!test_QueryInfoPolicy(p, mem_ctx, &handle)) {
+		ret = False;
+	}
 	
 #if 0
 	if (!test_Delete(p, mem_ctx, &handle)) {