diff -uNr bird-pristine/doc/bird.sgml bird-1.0.5/doc/bird.sgml
--- bird-pristine/doc/bird.sgml	Sun Sep  3 11:25:26 2000
+++ bird-1.0.5/doc/bird.sgml	Sat Nov 24 14:04:39 2001
@@ -1320,8 +1320,8 @@
 <p>In addition to options common for all to other protocols, RIP supports the following ones:
 
 <descrip>
-	<tag/authentication none|password|md5/ selects authentication method to be used. <cf/none/ means that
-	  packets are not authenticated at all, <cf/password/ means that a plaintext password is embedded
+	<tag/authentication none|plaintext|md5/ selects authentication method to be used. <cf/none/ means that
+	  packets are not authenticated at all, <cf/plaintext/ means that a plaintext password is embedded
 	  into each packet, and <cf/md5/ means that packets are authenticated using a md5 cryptographic
 	  hash. If you set authentication to not-none, it is a good idea to add <cf>passwords { }</cf>
 	  section. Default: none.
diff -uNr bird-pristine/proto/ospf/rt.c bird-1.0.5/proto/ospf/rt.c
--- bird-pristine/proto/ospf/rt.c	Sat Jun  9 08:09:00 2001
+++ bird-1.0.5/proto/ospf/rt.c	Sat Nov 24 14:01:44 2001
@@ -195,7 +195,7 @@
     else
     {
       /* Update routing table */
-      if(nf->en->nhi==NULL)
+      if(nf->en->nh==ipa_from_u32(0))
       {
         struct top_hash_entry *en=nf->en;
         struct ospf_neighbor *neigh;