[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 9ec52cc..10a5de6 100644
--- 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 cc66d11..32dfdea 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -7693,10 +7693,9 @@
       /* 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",