fe27bc8135
- ipvs: Allow real servers to be specified with a weight of 0 Resolves: RHEL-7699 - vrrp: Fix using VMACs with unicast peers Resolves: RHEL-7694 - lvs: if lost misc check child register checker again Resolves: RHEL-66742
24 lines
864 B
Diff
24 lines
864 B
Diff
commit 4a56ddf74b310d75c31bb98fee6f6789b04f6891
|
|
Author: Quentin Armitage <quentin@armitage.org.uk>
|
|
Date: Mon Jul 20 07:03:54 2020 +0100
|
|
|
|
vrrp: Fix building without VMAC support
|
|
|
|
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
|
|
|
|
diff --git a/keepalived/vrrp/vrrp_parser.c b/keepalived/vrrp/vrrp_parser.c
|
|
index 1d19c684..3e05f698 100644
|
|
--- a/keepalived/vrrp/vrrp_parser.c
|
|
+++ b/keepalived/vrrp/vrrp_parser.c
|
|
@@ -412,9 +412,9 @@ vrrp_handler(const vector_t *strvec)
|
|
static void
|
|
vrrp_end_handler(void)
|
|
{
|
|
-#ifdef _HAVE_VRRP_VMAC_
|
|
vrrp_t *vrrp = list_last_entry(&vrrp_data->vrrp, vrrp_t, e_list);
|
|
|
|
+#ifdef _HAVE_VRRP_VMAC_
|
|
if (!list_empty(&vrrp->unicast_peer) && vrrp->vmac_flags) {
|
|
report_config_error(CONFIG_GENERAL_ERROR, "(%s): Cannot use VMAC/ipvlan with unicast peers - clearing use_vmac", vrrp->iname);
|
|
vrrp->vmac_flags = 0;
|