diff options
author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2018-01-09 18:42:22 +0100 |
---|---|---|
committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2018-01-09 18:42:22 +0100 |
commit | 72163bd5f3ccefc1edda585f6f605c37e774a0b8 (patch) | |
tree | 59df1629a4c0884e2072c8082e9b4d392be648e4 /proto/rpki | |
parent | 09c1e370b3084f7acb7c3777427670a69945368a (diff) |
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.
Diffstat (limited to 'proto/rpki')
-rw-r--r-- | proto/rpki/rpki.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c index 3145399b..74860071 100644 --- a/proto/rpki/rpki.c +++ b/proto/rpki/rpki.c @@ -901,7 +901,7 @@ rpki_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 void |