[ospfd] trim redundant strings

2006-01-10 Paul Jakma <paul.jakma@sun.com>

	* ospf_vty.c: (config_write_ospf_distribute) trim down
	  redundant strings.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 9ec52ccd161ba6241b39a8edd90b4ca31ccafa41..10a5de6a15895726f1b3d81509eb9531fccb5370 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -5,6 +5,8 @@
          This was causing ospfd to not start if router-id had not
          been configured statically.
          (ospf_if_update) ditto.
+       * ospf_vty.c: (config_write_ospf_distribute) trim down
+         redundant strings.
 
 2005-11-26 Paul Jakma <paul.jakma@sun.com>
 

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index cc66d119d9b5b593afd29a1b88b3ee80d9b20249..32dfdea055515c228c4ecbe20335c82b2605c219 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -7693,10 +7693,9 @@ config_write_ospf_distribute (struct vty *vty, struct ospf *ospf)
       /* default-information print. */
       if (ospf->default_originate != DEFAULT_ORIGINATE_NONE)
        {
-         if (ospf->default_originate == DEFAULT_ORIGINATE_ZEBRA)
-           vty_out (vty, " default-information originate");
-         else
-           vty_out (vty, " default-information originate always");
+         vty_out (vty, " default-information originate");
+         if (ospf->default_originate == DEFAULT_ORIGINATE_ALWAYS)
+           vty_out (vty, " always");
 
          if (ospf->dmetric[DEFAULT_ROUTE].value >= 0)
            vty_out (vty, " metric %d",