From: Arvid Requate <requate@univention.de>
Date: Mon, 7 Jul 2014 16:43:05 +0000 (+0200)
Subject: s4-backupkey: fix ndr_pull error on empty input
X-Git-Tag: samba-4.2.0~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87c525d1be9e3bec9f60c57ba8adadfaa8ce8548;p=thirdparty%2Fsamba.git

s4-backupkey: fix ndr_pull error on empty input

[MS-BKRP] 3.1.4.1 specifies for BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID that
the server must ignore the input data. This patch fixes
  ndr_pull_error(11): Pull bytes 4 (../librpc/ndr/ndr_basic.c:148)

Signed-off-by: Arvid Requate <requate@univention.de>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 3bc3bec6d702ef62bf026ff64855edc8fb900088)
---

diff --git a/librpc/idl/backupkey.idl b/librpc/idl/backupkey.idl
index e21030bb69a..b504ca578e9 100644
--- a/librpc/idl/backupkey.idl
+++ b/librpc/idl/backupkey.idl
@@ -47,6 +47,9 @@ interface backupkey
 		uint8 key[256];
 	} bkrp_dc_serverwrap_key;
 
+	[public] typedef struct {
+	} bkrp_empty;
+
 	[public,gensize] typedef struct {
 		uint32 version;
 		uint32 encrypted_secret_len;
@@ -103,7 +106,7 @@ interface backupkey
 
 	[public] typedef [nodiscriminant] union {
 		[case(BACKUPKEY_RESTORE_GUID_INTEGER)] bkrp_client_side_wrapped restore_req;
-		[case(BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER)] bkrp_client_side_wrapped cert_req;
+		[case(BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER)] bkrp_empty empty;
 	} bkrp_data_in_blob;
 
 	/******************/