X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=bin%2Fdefault%2Flibrpc%2Fgen_ndr%2Fpacket-dcerpc-backupkey.c;h=d2aed6f2ae642992b88c4ec61fd5418ecb40226a;hb=7992156bf6d0c2080492b8b466f98c7763681787;hp=8488ba4ddcce7372466b4c6257eaf094b8869c07;hpb=194c7f7fe16da2be34b9a6cd26f6248deaec6d3c;p=metze%2Fsamba%2Fwip.git

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-backupkey.c b/bin/default/librpc/gen_ndr/packet-dcerpc-backupkey.c
index 8488ba4ddcce..d2aed6f2ae64 100644
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-backupkey.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-backupkey.c
@@ -42,10 +42,9 @@ static gint ett_backupkey_bkrp_data_in_blob = -1;
 
 
 /* Header field declarations */
-static gint hf_backupkey_bkrp_data_in_blob_valBACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER_cert_req = -1;
 static gint hf_backupkey_bkrp_access_check_v2_nonce = -1;
 static gint hf_backupkey_bkrp_client_side_wrapped_access_check_len = -1;
-static gint hf_backupkey_bkrp_data_in_blob_valBACKUPKEY_RESTORE_GUID_INTEGER_restore_req = -1;
+static gint hf_backupkey_bkrp_data_in_blob_cert_req = -1;
 static gint hf_backupkey_bkrp_exported_RSA_key_pair_prime2 = -1;
 static gint hf_backupkey_bkrp_encrypted_secret_v3_payload_key = -1;
 static gint hf_backupkey_bkrp_client_side_wrapped_guid = -1;
@@ -53,6 +52,7 @@ static gint hf_backupkey_bkrp_exported_RSA_key_pair_modulus_ = -1;
 static gint hf_backupkey_bkrp_exported_RSA_key_pair_public_exponent_ = -1;
 static gint hf_backupkey_bkrp_exported_RSA_key_pair_header1 = -1;
 static gint hf_backupkey_bkrp_exported_RSA_key_pair_certificate_len = -1;
+static gint hf_backupkey_bkrp_data_in_blob_restore_req = -1;
 static gint hf_backupkey_bkrp_exported_RSA_key_pair_coefficient_ = -1;
 static gint hf_backupkey_bkrp_dc_serverwrap_key_magic = -1;
 static gint hf_backupkey_bkrp_exported_RSA_key_pair_magic2 = -1;
@@ -192,8 +192,8 @@ const value_string backupkey_bkrp_guid_to_integer_vals[] = {
 	{ BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER, "BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER" },
 { 0, NULL }
 };
-static int backupkey_dissect_element_bkrp_data_in_blob_valBACKUPKEY_RESTORE_GUID_INTEGER_restore_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int backupkey_dissect_element_bkrp_data_in_blob_valBACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER_cert_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int backupkey_dissect_element_bkrp_data_in_blob_restore_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int backupkey_dissect_element_bkrp_data_in_blob_cert_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int backupkey_dissect_element_bkrp_BackupKey_guidActionAgent(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int backupkey_dissect_element_bkrp_BackupKey_guidActionAgent_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int backupkey_dissect_element_bkrp_BackupKey_data_in(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1310,17 +1310,17 @@ backupkey_dissect_enum_bkrp_guid_to_integer(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-backupkey_dissect_element_bkrp_data_in_blob_valBACKUPKEY_RESTORE_GUID_INTEGER_restore_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+backupkey_dissect_element_bkrp_data_in_blob_restore_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-	offset = backupkey_dissect_struct_bkrp_client_side_wrapped(tvb,offset,pinfo,tree,drep,hf_backupkey_bkrp_data_in_blob_valBACKUPKEY_RESTORE_GUID_INTEGER_restore_req,0);
+	offset = backupkey_dissect_struct_bkrp_client_side_wrapped(tvb,offset,pinfo,tree,drep,hf_backupkey_bkrp_data_in_blob_restore_req,0);
 
 	return offset;
 }
 
 static int
-backupkey_dissect_element_bkrp_data_in_blob_valBACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER_cert_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+backupkey_dissect_element_bkrp_data_in_blob_cert_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-	offset = backupkey_dissect_struct_bkrp_client_side_wrapped(tvb,offset,pinfo,tree,drep,hf_backupkey_bkrp_data_in_blob_valBACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER_cert_req,0);
+	offset = backupkey_dissect_struct_bkrp_client_side_wrapped(tvb,offset,pinfo,tree,drep,hf_backupkey_bkrp_data_in_blob_cert_req,0);
 
 	return offset;
 }
@@ -1341,11 +1341,11 @@ backupkey_dissect_bkrp_data_in_blob(tvbuff_t *tvb _U_, int offset _U_, packet_in
 
 	switch(level) {
 		case BACKUPKEY_RESTORE_GUID_INTEGER:
-			offset = backupkey_dissect_element_bkrp_data_in_blob_valBACKUPKEY_RESTORE_GUID_INTEGER_restore_req(tvb, offset, pinfo, tree, drep);
+			offset = backupkey_dissect_element_bkrp_data_in_blob_restore_req(tvb, offset, pinfo, tree, drep);
 		break;
 
 		case BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER:
-			offset = backupkey_dissect_element_bkrp_data_in_blob_valBACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER_cert_req(tvb, offset, pinfo, tree, drep);
+			offset = backupkey_dissect_element_bkrp_data_in_blob_cert_req(tvb, offset, pinfo, tree, drep);
 		break;
 	}
 	proto_item_set_len(item, offset-old_offset);
@@ -1511,14 +1511,12 @@ static dcerpc_sub_dissector backupkey_dissectors[] = {
 void proto_register_dcerpc_backupkey(void)
 {
 	static hf_register_info hf[] = {
-	{ &hf_backupkey_bkrp_data_in_blob_valBACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER_cert_req,
-	  { "Cert Req", "backupkey.bkrp_data_in_blob_valBACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER.cert_req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_backupkey_bkrp_access_check_v2_nonce,
 	  { "Nonce", "backupkey.bkrp_access_check_v2.nonce", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_backupkey_bkrp_client_side_wrapped_access_check_len,
 	  { "Access Check Len", "backupkey.bkrp_client_side_wrapped.access_check_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_backupkey_bkrp_data_in_blob_valBACKUPKEY_RESTORE_GUID_INTEGER_restore_req,
-	  { "Restore Req", "backupkey.bkrp_data_in_blob_valBACKUPKEY_RESTORE_GUID_INTEGER.restore_req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_backupkey_bkrp_data_in_blob_cert_req,
+	  { "Cert Req", "backupkey.bkrp_data_in_blob.cert_req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_backupkey_bkrp_exported_RSA_key_pair_prime2,
 	  { "Prime2", "backupkey.bkrp_exported_RSA_key_pair.prime2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_backupkey_bkrp_encrypted_secret_v3_payload_key,
@@ -1533,6 +1531,8 @@ void proto_register_dcerpc_backupkey(void)
 	  { "Header1", "backupkey.bkrp_exported_RSA_key_pair.header1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_backupkey_bkrp_exported_RSA_key_pair_certificate_len,
 	  { "Certificate Len", "backupkey.bkrp_exported_RSA_key_pair.certificate_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_backupkey_bkrp_data_in_blob_restore_req,
+	  { "Restore Req", "backupkey.bkrp_data_in_blob.restore_req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_backupkey_bkrp_exported_RSA_key_pair_coefficient_,
 	  { "Subcontext length", "backupkey.bkrp_exported_RSA_key_pair.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_backupkey_bkrp_dc_serverwrap_key_magic,