Merge pull request #330 from dwalton76/ospf-no-log-adjacency-changes-detail

ospfd: "no log-adjacency-changes detail" disables log-adjacency-changes

diff --combined ospf6d/ospf6_top.c
index c2545afdc6c34d58344bd46080b41dd312a1ca84,bbb2a5e42d672481e5114c7f9ddf772a55708471..f2a1c8c2ecfbc65f0a88018f11f3645b920e6926
--- 1/ospf6d/ospf6_top.c
--- 2/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@@ -29,7 -29,6 +29,7 @@@
  #include "table.h"
  #include "thread.h"
  #include "command.h"
 +#include "defaults.h"
  
  #include "ospf6_proto.h"
  #include "ospf6_message.h"
@@@ -161,10 -160,7 +161,10 @@@ ospf6_create (void
    o->distance_table = route_table_init ();
  
    /* Enable "log-adjacency-changes" */
 +#if DFLT_OSPF6_LOG_ADJACENCY_CHANGES
    SET_FLAG(o->config_flags, OSPF6_LOG_ADJACENCY_CHANGES);
 +#endif
 +
    QOBJ_REG (o, ospf6);
  
    return o;
@@@ -395,7 -391,6 +395,6 @@@ DEFUN (no_ospf6_log_adjacency_changes_d
    VTY_DECLVAR_CONTEXT(ospf6, ospf6);
  
    UNSET_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_DETAIL);
-   UNSET_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_CHANGES);
    return CMD_SUCCESS;
  }
  
@@@ -1026,10 -1021,8 +1025,10 @@@ config_write_ospf6 (struct vty *vty
      {
        if (CHECK_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_DETAIL))
          vty_out(vty, " log-adjacency-changes detail%s", VTY_NEWLINE);
 +      else if (!DFLT_OSPF6_LOG_ADJACENCY_CHANGES)
 +        vty_out(vty, " log-adjacency-changes%s", VTY_NEWLINE);
      }
 -  else
 +  else if (DFLT_OSPF6_LOG_ADJACENCY_CHANGES)
      {
        vty_out(vty, " no log-adjacency-changes%s", VTY_NEWLINE);
      }

diff --combined ospfd/ospf_vty.c
index 6f729036951974c845e2f17f3ba2898182b330d7,64ccea36b24172dd4b2cf2fffe7dcfb5d99765fc..49474df82626649fbb32591fe1d3354582bd6a8e
--- 1/ospfd/ospf_vty.c
--- 2/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@@ -34,7 -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"
@@@ -2138,7 -2137,6 +2138,6 @@@ DEFUN (no_ospf_log_adjacency_changes_de
  {
    VTY_DECLVAR_CONTEXT(ospf, ospf);
  
-   UNSET_FLAG(ospf->config, OSPF_LOG_ADJACENCY_CHANGES);
    UNSET_FLAG(ospf->config, OSPF_LOG_ADJACENCY_DETAIL);
    return CMD_SUCCESS;
  }
@@@ -8807,10 -8805,8 +8806,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);
          }