From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Mon, 20 Jun 2011 18:35:59 +0000 (+0200)
Subject: Fixes a bug related to protocol enabling and reconfigure.
X-Git-Tag: v1.3.2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23fd464447c4d0f0efe7b61ca3128bbb1bc1c21c;p=thirdparty%2Fbird.git

Fixes a bug related to protocol enabling and reconfigure.

When a protocol was enabled interactively (but disabled in the config
file), then reconfigure in some cases forgets to disable it.
---

diff --git a/nest/proto.c b/nest/proto.c
index f04b5a6c8..4a154d590 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -277,7 +277,7 @@ proto_reconfigure(struct proto *p, struct proto_config *oc, struct proto_config
 
   /* If there is a too big change in core attributes, ... */
   if ((nc->protocol != oc->protocol) ||
-      (nc->disabled != oc->disabled) ||
+      (nc->disabled != p->disabled) ||
       (nc->table->table != oc->table->table) ||
       (proto_get_router_id(nc) != proto_get_router_id(oc)))
     return 0;