From 6829dc1a2577ce9695d23e8170ae46f5a17075d3 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Fri, 9 Jul 2021 12:35:51 +0200
Subject: [PATCH] net/haproxy: fix empty resolve-prefer option, closes #2340

---
 net/haproxy/pkg-descr                                        | 5 +++++
 .../opnsense/service/templates/OPNsense/HAProxy/haproxy.conf | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/net/haproxy/pkg-descr b/net/haproxy/pkg-descr
index b445b6efa..4d9a646df 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.4
+
+Fixed:
+* fix empty resolve-prefer option (#2340)
+
 3.3
 
 Changed:
diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
index 5cd9e0722..cfb2c1d01 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
@@ -1657,7 +1657,7 @@ backend {{backend.name}}
 {%               if backend.resolvePrefer|default("") != "" %}
 {#                 # prefer backend configuration #}
 {%                 do server_options.append('resolve-prefer ' ~ backend.resolvePrefer) %}
-{%               elif server_data.linkedResolver|default("") != "" %}
+{%               elif server_data.resolvePrefer|default("") != "" %}
 {%                 do server_options.append('resolve-prefer ' ~ server_data.resolvePrefer) %}
 {%               endif %}
 {#               # source address #}