diff options
| author | Philippe Guibert <philippe.guibert@6wind.com> | 2018-11-21 14:46:08 +0100 |
|---|---|---|
| committer | Philippe Guibert <philippe.guibert@6wind.com> | 2018-11-21 17:21:19 +0100 |
| commit | 4fe52e76226a37eb998991491ac635eac7024167 (patch) | |
| tree | dc14fa2645104351d46621dd070cb66385be0f8d /zebra/zebra_netns_notify.c | |
| parent | Merge pull request #3363 from pacovn/static_analysis__ISO_C_return_compliance (diff) | |
| download | frr-4fe52e76226a37eb998991491ac635eac7024167.tar.xz frr-4fe52e76226a37eb998991491ac635eac7024167.zip | |
lib, zebra: default vrf configured will not be overwritten by discovery
the netns discovery process executed when vrf backend is netns, allows
the zebra daemon to dynamically change the default vrf name value. This
option is disabled, when the zebra is forced to a default vrf value with
option -o.
PR=61513
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Diffstat (limited to 'zebra/zebra_netns_notify.c')
| -rw-r--r-- | zebra/zebra_netns_notify.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c index 4d2aefa23..3f69b9841 100644 --- a/zebra/zebra_netns_notify.c +++ b/zebra/zebra_netns_notify.c @@ -219,7 +219,7 @@ static int zebra_ns_ready_read(struct thread *t) zlog_warn( "NS notify : NS %s is default VRF." " Updating VRF Name", basename(netnspath)); - vrf_set_default_name(basename(netnspath)); + vrf_set_default_name(basename(netnspath), false); return zebra_ns_continue_read(zns_info, 1); } @@ -314,7 +314,7 @@ void zebra_ns_notify_parse(void) zlog_warn( "NS notify : NS %s is default VRF." " Updating VRF Name", dent->d_name); - vrf_set_default_name(dent->d_name); + vrf_set_default_name(dent->d_name, false); continue; } zebra_ns_notify_create_context_from_entry_name(dent->d_name); |