diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-04-04 18:34:08 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-04-04 19:01:47 +0200 |
| commit | 3e7c8d040ce092d42b485cb45461af575a99e39e (patch) | |
| tree | 20ddb4bf5d39b348041af75b7102623e4f0d29c2 /ospfd/ospf_vty.c | |
| parent | Merge pull request #322 from qlyoung/fix-distance-commands (diff) | |
| parent | Release: FRR-2.0 (diff) | |
| download | frr-3e7c8d040ce092d42b485cb45461af575a99e39e.tar.xz frr-3e7c8d040ce092d42b485cb45461af575a99e39e.zip | |
Merge branch 'stable/2.0'
Fixed minor conflicts from "defaults" change on stable.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ospfd/ospf_vty.c')
| -rw-r--r-- | ospfd/ospf_vty.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 121ef018b..6f7290369 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -34,6 +34,7 @@ #include "log.h" #include "zclient.h" #include <lib/json.h> +#include "defaults.h" #include "ospfd/ospfd.h" #include "ospfd/ospf_asbr.h" @@ -8806,8 +8807,10 @@ ospf_config_write (struct vty *vty) { if (CHECK_FLAG(ospf->config, OSPF_LOG_ADJACENCY_DETAIL)) vty_out(vty, " log-adjacency-changes detail%s", VTY_NEWLINE); + else if (!DFLT_OSPF_LOG_ADJACENCY_CHANGES) + vty_out(vty, " log-adjacency-changes%s", VTY_NEWLINE); } - else + else if (DFLT_OSPF_LOG_ADJACENCY_CHANGES) { vty_out(vty, " no log-adjacency-changes%s", VTY_NEWLINE); } |