summaryrefslogtreecommitdiff
path: root/ripd
diff options
context:
space:
mode:
Diffstat (limited to 'ripd')
-rw-r--r--ripd/ChangeLog7
-rw-r--r--ripd/rip_interface.c12
2 files changed, 10 insertions, 9 deletions
diff --git a/ripd/ChangeLog b/ripd/ChangeLog
index 0aa1f24b..5d2c1644 100644
--- a/ripd/ChangeLog
+++ b/ripd/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-01 Paul Jakma <paul.jakma@sun.com>
+
+ * rip_interface.c: Fix authentication, no-auth impossible to specify
+ (rip_interface_new) default to RIP_NO_AUTH
+ (rip_interface_reset) ditto
+ (rip_interface_config_write) write out config for simple
+
2005-05-29 Paul Jakma <paul@dishone.st>
* ripd.c: (rip_output_process) fix error which crept in my
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index 0e267f98..4a6f78e2 100644
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -123,8 +123,7 @@ rip_interface_new ()
/* Default authentication type is simple password for Cisco
compatibility. */
- /* ri->auth_type = RIP_NO_AUTH; */
- ri->auth_type = RIP_AUTH_SIMPLE_PASSWORD;
+ ri->auth_type = RIP_NO_AUTH;
ri->md5_auth_len = RIP_AUTH_MD5_COMPAT_SIZE;
/* Set default split-horizon behavior. If the interface is Frame
@@ -632,8 +631,7 @@ rip_interface_reset ()
ri->ri_send = RI_RIP_UNSPEC;
ri->ri_receive = RI_RIP_UNSPEC;
- /* ri->auth_type = RIP_NO_AUTH; */
- ri->auth_type = RIP_AUTH_SIMPLE_PASSWORD;
+ ri->auth_type = RIP_NO_AUTH;
if (ri->auth_str)
{
@@ -1714,8 +1712,7 @@ DEFUN (no_ip_rip_authentication_mode,
ifp = (struct interface *)vty->index;
ri = ifp->info;
- /* ri->auth_type = RIP_NO_AUTH; */
- ri->auth_type = RIP_AUTH_SIMPLE_PASSWORD;
+ ri->auth_type = RIP_NO_AUTH;
ri->md5_auth_len = RIP_AUTH_MD5_COMPAT_SIZE;
return CMD_SUCCESS;
@@ -2052,11 +2049,8 @@ rip_interface_config_write (struct vty *vty)
VTY_NEWLINE);
/* RIP authentication. */
-#if 0
- /* RIP_AUTH_SIMPLE_PASSWORD becomes default mode. */
if (ri->auth_type == RIP_AUTH_SIMPLE_PASSWORD)
vty_out (vty, " ip rip authentication mode text%s", VTY_NEWLINE);
-#endif /* 0 */
if (ri->auth_type == RIP_AUTH_MD5)
{