I included the wrong diff. Here's the correct one. Mark
On Thu, 2009-10-08 at 19:44 +0200, Mark Borst wrote: > Hi Andreas > > Thanks for responding so quickly. > > Attached is the unified diff as you requested. > I would prefer when you could take this upstream. > > Thanks again, > > Mark > > On Thu, 2009-10-08 at 10:59 +0200, Andreas Henriksson wrote: > > Hello Mark! > > > > On Wed, Oct 07, 2009 at 05:45:28PM +0200, Mark Borst wrote: > > [...] > > > The command "ip mroute show" will only show the first Oif. > > [...] > > > > Thank you very much for the great bug report and the patch! > > > > [...] > > > diff -rc iproute-20090324-origdeb/ip/ipmroute.c > > > iproute-20090324/ip/ipmroute.c > > [...] > > > > Could you please generate the diff in unified format (-u) ? > > > > I'll forward the patch upstream for you if you wish, but it's probably > > better > > if you take the discussion upstream yourself! > > Please post to the net...@vger.kernel.org mailing list and you also might > > want to send a copy to shemmin...@vyatta.com, who is the upstream > > maintainer. > > > > -- > > Regards, > > Andreas Henriksson >
--- iproute-20090324-origdeb/ip/ipmroute.c 2009-10-07 17:21:00.000000000 +0200 +++ iproute-20090324/ip/ipmroute.c 2009-10-07 17:34:01.000000000 +0200 @@ -95,7 +95,7 @@ char obuf[256]; oiflist[0] = 0; - if (sscanf(buf, "%x%x%d%u%u%u%s", maddr.data, msrc.data, &vifi, + if (sscanf(buf, "%x%x%d%u%u%u%[^\n]", maddr.data, msrc.data, &vifi, &pkts, &b, &w, oiflist) < 6) continue;
