Fix a bug where existing v6 CARP alias addresses cannot be changed.

Ticket #6892
pfsense · Dec 21, 2016 · 580e1b6 · 580e1b6
1 parent 56c0b07
commit 580e1b6
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
@@ -554,8 +554,11 @@ in6_control(struct socket *so, u_long cmd, caddr_t data,
 		 */
 		if ((error = in6_update_ifa(ifp, ifra, ia, 0)) != 0)
 			goto out;
-		if (ia != NULL)
+		if (ia != NULL) {
+			if (ia->ia_ifa.ifa_carp)
+				(*carp_detach_p)(&ia->ia_ifa, false);
 			ifa_free(&ia->ia_ifa);
+		}
 		if ((ia = in6ifa_ifpwithaddr(ifp, &ifra->ifra_addr.sin6_addr))
 		    == NULL) {
 			/*
@@ -622,7 +625,7 @@ in6_control(struct socket *so, u_long cmd, caddr_t data,
 			 */
 			if ((error = nd6_prelist_add(&pr0, NULL, &pr)) != 0) {
 				if (carp_attached)
-					(*carp_detach_p)(&ia->ia_ifa, false);
+					(*carp_detach_p)(&ia->ia_ifa, true);
 				goto out;
 			}
 		}