summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2011-06-20 20:35:59 +0200
committerOndrej Zajicek <santiago@crfreenet.org>2011-06-20 20:35:59 +0200
commit23fd464447c4d0f0efe7b61ca3128bbb1bc1c21c (patch)
tree3d8b832f226719b693457550006743a4195f7134
parentae85e28cf410cefe4f6e1cdf92510fbf9cea7ae0 (diff)
downloadbird-23fd464447c4d0f0efe7b61ca3128bbb1bc1c21c.tar
bird-23fd464447c4d0f0efe7b61ca3128bbb1bc1c21c.zip
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.
-rw-r--r--nest/proto.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nest/proto.c b/nest/proto.c
index f04b5a6..4a154d5 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;