1 files changed, 33 insertions, 2 deletions

diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 749873bcf8..25d968fb68 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -180,6 +180,8 @@ void ospf6_delete(struct ospf6 *o)
 	struct ospf6_area *oa;
 
 	QOBJ_UNREG(o);
+
+	ospf6_flush_self_originated_lsas_now();
 	ospf6_disable(ospf6);
 
 	for (ALL_LIST_ELEMENTS(o->area_list, node, nnode, oa))
@@ -333,6 +335,8 @@ DEFUN(ospf6_router_id,
 	int ret;
 	const char *router_id_str;
 	u_int32_t router_id;
+	struct ospf6_area *oa;
+	struct listnode *node;
 
 	argv_find(argv, argc, "A.B.C.D", &idx);
 	router_id_str = argv[idx]->arg;
@@ -344,8 +348,17 @@ DEFUN(ospf6_router_id,
 	}
 
 	o->router_id_static = router_id;
-	if (o->router_id == 0)
-		o->router_id = router_id;
+
+	for (ALL_LIST_ELEMENTS_RO(o->area_list, node, oa)) {
+		if (oa->full_nbrs) {
+			vty_out(vty,
+				"For this router-id change to take effect,"
+				" save config and restart ospf6d\n");
+			return CMD_SUCCESS;
+		}
+	}
+
+	o->router_id = router_id;
 
 	return CMD_SUCCESS;
 }
@@ -358,8 +371,22 @@ DEFUN(no_ospf6_router_id,
       V4NOTATION_STR)
 {
 	VTY_DECLVAR_CONTEXT(ospf6, o);
+	struct ospf6_area *oa;
+	struct listnode *node;
+
 	o->router_id_static = 0;
+
+	for (ALL_LIST_ELEMENTS_RO(o->area_list, node, oa)) {
+		if (oa->full_nbrs) {
+			vty_out(vty,
+				"For this router-id change to take effect,"
+				" save config and restart ospf6d\n");
+			return CMD_SUCCESS;
+		}
+	}
 	o->router_id = 0;
+	if (o->router_id_zebra.s_addr)
+		o->router_id = (uint32_t)o->router_id_zebra.s_addr;
 
 	return CMD_SUCCESS;
 }
@@ -521,6 +548,10 @@ DEFUN (ospf6_distance_ospf6,
 	VTY_DECLVAR_CONTEXT(ospf6, o);
 	int idx = 0;
 
+	o->distance_intra = 0;
+	o->distance_inter = 0;
+	o->distance_external = 0;
+
 	if (argv_find(argv, argc, "intra-area", &idx))
 		o->distance_intra = atoi(argv[idx + 1]->arg);
 	idx = 0;