commit 3e0b3a56217dab13b26e7f7fd634e7450dde55e2
author paul <paul> Mon Aug 23 18:58:32 2004 +0000
committer paul <paul> Mon Aug 23 18:58:32 2004 +0000
tree d62322ccbe368d643300ae71a6a53db21ebe4c94
parent 0b7787c542aa8470797a473c5dae8a8fb2b3cfcb

2004-08-23 Paul Jakma <paul@dishone.st>

        * zebra/zserv.c: (zebra_init) remove implicit ip forward enabling
        * NEWS: warn about forwarding change

zebra/zserv.c

diff --git a/zebra/zserv.c b/zebra/zserv.c
index 3c582af..4779b64 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -1676,11 +1676,11 @@
 int
 config_write_forwarding (struct vty *vty)
 {
-  if (! ipforward ())
-    vty_out (vty, "no ip forwarding%s", VTY_NEWLINE);
+  if (ipforward ())
+    vty_out (vty, "ip forwarding%s", VTY_NEWLINE);
 #ifdef HAVE_IPV6
-  if (! ipforward_ipv6 ())
-    vty_out (vty, "no ipv6 forwarding%s", VTY_NEWLINE);
+  if (ipforward_ipv6 ())
+    vty_out (vty, "ipv6 forwarding%s", VTY_NEWLINE);
 #endif /* HAVE_IPV6 */
   vty_out (vty, "!%s", VTY_NEWLINE);
   return 0;
@@ -1702,12 +1702,6 @@
   /* Client list init. */
   zebrad.client_list = list_new ();
 
-  /* Forwarding is on by default. */
-  ipforward_on ();
-#ifdef HAVE_IPV6
-  ipforward_ipv6_on ();
-#endif /* HAVE_IPV6 */
-
   /* Make zebra server socket. */
 #ifdef HAVE_TCP_ZEBRA
   zebra_serv ();