From 72163bd5f3ccefc1edda585f6f605c37e774a0b8 Mon Sep 17 00:00:00 2001 From: "Ondrej Zajicek (work)" Date: Tue, 9 Jan 2018 18:42:22 +0100 Subject: Nest: Allow modification of channels inherited from templates Multiple definitions of same channels are forbidden, but inherited channel can be redefined. In such case channel options are merged. --- proto/rip/rip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'proto/rip/rip.c') diff --git a/proto/rip/rip.c b/proto/rip/rip.c index a3eeaf17..85e37cea 100644 --- a/proto/rip/rip.c +++ b/proto/rip/rip.c @@ -1078,7 +1078,7 @@ rip_postconfig(struct proto_config *CF) /* Define default channel */ if (EMPTY_LIST(CF->channels)) - channel_config_new(NULL, CF->net_type, CF); + channel_config_new(NULL, net_label[CF->net_type], CF->net_type, CF); } static struct proto * -- cgit v1.2.3