From 5d0b760a96064dffb19c90fcf6f311f7b36029c6 Mon Sep 17 00:00:00 2001
From: Mihaela Stoica <mihaela.stoica@citrix.com>
Date: Fri, 18 May 2018 14:18:53 +0100
Subject: [PATCH] CA-288751: Fix the RBAC checks for probe_ext

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
---
 XenAdmin/Wizards/NewSRWizard.cs               | 2 ++
 XenModel/XenServerProxy/RbacCollectorProxy.cs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/XenAdmin/Wizards/NewSRWizard.cs b/XenAdmin/Wizards/NewSRWizard.cs
index a914b2572..75a509507 100644
--- a/XenAdmin/Wizards/NewSRWizard.cs
+++ b/XenAdmin/Wizards/NewSRWizard.cs
@@ -171,6 +171,8 @@ namespace XenAdmin.Wizards
             
 
             check.AddApiCheckRange(new RbacMethodList("SR.probe"));
+            if (Helpers.KolkataOrGreater(xenConnection) && !Helpers.FeatureForbidden(xenConnection, Host.CorosyncDisabled))
+                check.AddApiCheckRange(new RbacMethodList("SR.probe_ext"));
 
             if (_srToReattach == null)
             {
diff --git a/XenModel/XenServerProxy/RbacCollectorProxy.cs b/XenModel/XenServerProxy/RbacCollectorProxy.cs
index 7c8d381de..efd2be1dd 100644
--- a/XenModel/XenServerProxy/RbacCollectorProxy.cs
+++ b/XenModel/XenServerProxy/RbacCollectorProxy.cs
@@ -85,6 +85,8 @@ namespace XenAdmin.Core
                     return new Response<string>("");
                 case "String[]":
                     return new Response<string[]>(new string[0]);
+                case "Proxy_Probe_result[]":
+                    return new Response<Proxy_Probe_result[]>(new Proxy_Probe_result[0]);
                 default:
                     System.Diagnostics.Trace.Assert(false);  // need to add more types here
                     return new Response<string>("");