From 8756e7c807bf3abb600de41269c58a875adc5bab Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Fri, 12 Mar 2021 14:34:24 +0100
Subject: [PATCH] net/haproxy: only accept a single value for backend/server
 fields, refs #2266

When Multiple=Y is set, then backend/server fields are preselected.
This makes it impossible to remove backends/servers, even when the rule
does not actually use them.
---
 net/haproxy/pkg-descr                                        | 5 +++++
 .../src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/net/haproxy/pkg-descr b/net/haproxy/pkg-descr
index 4e83fe306..86fcbd003 100644
--- a/net/haproxy/pkg-descr
+++ b/net/haproxy/pkg-descr
@@ -6,6 +6,11 @@ very high loads while needing persistence or Layer7 processing.
 Plugin Changelog
 ================
 
+3.1
+
+Changed:
+* rules: only accept a single value for backend/server fields (#2266)
+
 3.0
 
 Added:
diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
index 8c172b6cf..3beabcd33 100644
--- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
+++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
@@ -2086,7 +2086,7 @@
                         </template>
                     </Model>
                     <ValidationMessage>Related backend item not found</ValidationMessage>
-                    <Multiple>Y</Multiple>
+                    <Multiple>N</Multiple>
                     <Required>N</Required>
                 </use_backend>
                 <use_server type="ModelRelationField">
@@ -2098,7 +2098,7 @@
                         </template>
                     </Model>
                     <ValidationMessage>Related server item not found</ValidationMessage>
-                    <Multiple>Y</Multiple>
+                    <Multiple>N</Multiple>
                     <Required>N</Required>
                 </use_server>
                 <http_request_auth type="TextField">