From: Igor Ryzhov <iryzhov@nfware.com>
Date: Fri, 2 Apr 2021 00:22:24 +0000 (+0300)
Subject: ospfd: ignore duplicated "ip ospf area" commands
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=3889b7a5d8893f45ce8851d50cc084a6da12a0a8;p=matthieu%2Ffrr.git

ospfd: ignore duplicated "ip ospf area" commands

Fixes #8388.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
---

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 031451d23b..755a19aa13 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -8108,9 +8108,12 @@ DEFUN (ip_ospf_area,
 		// update/create address-level params
 		params = ospf_get_if_params((ifp), (addr));
 		if (OSPF_IF_PARAM_CONFIGURED(params, if_area)) {
-			vty_out(vty,
-				"Must remove previous area/address config before changing ospf area\n");
-			return CMD_WARNING_CONFIG_FAILED;
+			if (!IPV4_ADDR_SAME(&params->if_area, &area_id)) {
+				vty_out(vty,
+					"Must remove previous area/address config before changing ospf area\n");
+				return CMD_WARNING_CONFIG_FAILED;
+			} else
+				return CMD_SUCCESS;
 		}
 		ospf_if_update_params((ifp), (addr));
 	}