From 41d3fc96959c9dea614822dfbb1891cd9a6f38a4 Mon Sep 17 00:00:00 2001
From: hasso <hasso>
Date: Tue, 6 Apr 2004 11:59:00 +0000
Subject: * Fixed lowering privileges in proc ipforward method. * Fixed "(no)
 ipv6 forwarding" command logic. * Added --disable-capabilities switch to
 configure.

---
 zebra/zserv.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'zebra/zserv.c')

diff --git a/zebra/zserv.c b/zebra/zserv.c
index 833b369d..c623151e 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -1919,8 +1919,15 @@ DEFUN (ipv6_forwarding,
 {
   int ret;
 
-  ret = ipforward_ipv6_on ();
+  ret = ipforward_ipv6 ();
   if (ret != 0)
+    {
+      vty_out (vty, "IPv6 forwarding is already on%s", VTY_NEWLINE);
+      return CMD_ERR_NOTHING_TODO;
+    }
+
+  ret = ipforward_ipv6_on ();
+  if (ret == 0)
     {
       vty_out (vty, "Can't turn on IPv6 forwarding%s", VTY_NEWLINE);
       return CMD_WARNING;
@@ -1938,6 +1945,13 @@ DEFUN (no_ipv6_forwarding,
 {
   int ret;
 
+  ret = ipforward_ipv6 ();
+  if (ret == 0)
+    {
+      vty_out (vty, "IP forwarding is already off%s", VTY_NEWLINE);
+      return CMD_ERR_NOTHING_TODO;
+    }
+
   ret = ipforward_ipv6_off ();
   if (ret != 0)
     {
-- 
cgit v1.2.1