From: Martin Mares <mj@ucw.cz>
Date: Mon, 17 Jan 2000 00:19:58 +0000 (+0000)
Subject: Don't forget changing proto->name to point to name in new configuration
X-Git-Tag: v1.2.0~1360
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26368f656c2398acc4d3ed55879d2f371cecf75b;p=thirdparty%2Fbird.git

Don't forget changing proto->name to point to name in new configuration
(to avoid the name being freed with the old config).

Also remember to add proto_pipe to protocol_list.
---

diff --git a/nest/proto.c b/nest/proto.c
index e4214ea86..4c6922796 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -248,6 +248,7 @@ protos_commit(struct config *new, struct config *old, int force_reconfig)
 		    {
 		      DBG("\t%s: same\n", oc->name);
 		      p->cf = nc;
+		      p->name = nc->name;
 		      nc->proto = p;
 		      continue;
 		    }
@@ -371,6 +372,9 @@ protos_build(void)
 #endif
 #ifdef CONFIG_OSPF
   add_tail(&protocol_list, &proto_ospf.n);
+#endif
+#ifdef CONFIG_PIPE
+  add_tail(&protocol_list, &proto_pipe.n);
 #endif
   proto_pool = rp_new(&root_pool, "Protocols");
   proto_flush_event = ev_new(proto_pool);