Merge svn revisions 924 and 925 from Zebra CVS. Also remove useless
ospf6_lsdb prototype declaration from ospf6_lsa.h. Report sent to Yasuhiro
Ohara as well.
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index a8a1ce1..7884a6b 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -523,6 +523,7 @@
           zlog_info ("Advertise as AS-External Id:%s", ibuf);
         }
 
+      match->path.origin.id = htonl (info->id);
       ospf6_as_external_lsa_originate (match);
       return;
     }
@@ -571,6 +572,7 @@
       zlog_info ("Advertise as AS-External Id:%s", ibuf);
     }
 
+  route->path.origin.id = htonl (info->id);
   ospf6_as_external_lsa_originate (route);
 
   /* Router-Bit (ASBR Flag) may have to be updated */