From 0cb8a01c38284a5a3f4ee4b017b69cd5f3e39f9a Mon Sep 17 00:00:00 2001 From: paul Date: Sun, 29 May 2005 11:27:24 +0000 Subject: 2005-05-29 Paul Jakma * ripd.c: (rip_output_process) fix error which crept in my previous rip auth untanglement commit - it had become impossible to not have authentication (even for v1). --- ripd/ChangeLog | 6 ++++++ ripd/ripd.c | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ripd') diff --git a/ripd/ChangeLog b/ripd/ChangeLog index 3e3273ec..0aa1f24b 100644 --- a/ripd/ChangeLog +++ b/ripd/ChangeLog @@ -1,3 +1,9 @@ +2005-05-29 Paul Jakma + + * ripd.c: (rip_output_process) fix error which crept in my + previous rip auth untanglement commit - it had become impossible + to not have authentication (even for v1). + 2005-05-28 Hasso Tepper * rip_routemap.c: Fix set_metric_addsub_cmd help, it's not about BGP diff --git a/ripd/ripd.c b/ripd/ripd.c index 3dd91dae..4723ebe0 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -2346,9 +2346,8 @@ rip_output_process (struct connected *ifc, struct sockaddr_in *to, stream_putc (s, version); stream_putw (s, 0); - /* auth header for simple or v2 && MD5 */ - if ( (ri->auth_type == RIP_AUTH_SIMPLE_PASSWORD) - || (version == RIPv2 && ri->auth_type == RIP_AUTH_MD5) ) + /* auth header for !v1 && !no_auth */ + if ( (ri->auth_type != RIP_NO_AUTH) && (version != RIPv1) ) doff = rip_auth_header_write (s, ri, key, auth_str, RIP_AUTH_SIMPLE_SIZE); } -- cgit v1.2.1