2005-05-29 Paul Jakma <paul@dishone.st>

	* 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).

diff --git a/ripd/ChangeLog b/ripd/ChangeLog
index 3e3273ec0d08cd167d6c0ad484e9c9a2cc041c97..0aa1f24bc667273aa9998e40d241436ad366dbe7 100644 (file)
--- a/ripd/ChangeLog
+++ b/ripd/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-29 Paul Jakma <paul@dishone.st>
+
+       * 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 <hasso at quagga.net>
 
        * 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 3dd91dae976faf0bfce9b0abd9d3236f6ab69279..4723ebe03a575489d982597386ff96fb161513ce 100644 (file)
--- 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);
           }