SEO

Here's a small patch that fixes a problem created in rde_spf.c from this commit:
CVSROOT: /cvs
Module name: src
Changes by: claudio@cvs.openbsd.org 2005/06/26 14:44:44

Modified files:
usr.sbin/ospfd : rde_spf.c

Log message:
Don't htonl() something that is already in network byte order. AS-Ext routes
suffered because of this. Normaly seen because they where not added to the rib
or ended up with a bad nexthop.
This is what you get for stealing code from bgpd
OK norby@

When he removed htonl(), he removed a paren from the wrong place, and
it broke rt_find() with:
/usr/src/usr.sbin/ospfd/rde_spf.c: In function `rt_lookup':
/usr/src/usr.sbin/ospfd/rde_spf.c:814: error: too few arguments to
function `rt_find'

Here's a patch to fix it:
Index: rde_spf.c
================================================== =================
RCS file: /cvs/src/usr.sbin/ospfd/rde_spf.c,v
retrieving revision 1.26
diff -u -r1.26 rde_spf.c
--- rde_spf.c 26 Jun 2005 20:44:44 -0000 1.26
+++ rde_spf.c 26 Jun 2005 22:45:16 -0000
@@ -811,7 +811,7 @@

do {
/* a DT_NET /32 is equivalent to a DT_RTR */
- if ((rn = rt_find(addr & prefixlen2mask(i)), i))
+ if ((rn = rt_find(addr & prefixlen2mask(i), i)))
return (rn);
} while (i-- != 0);

--- end patch ---
And it looks like hotplugd is called twice in the Makefile located in
usr.sbin, here's a patch that removes it from the first location, as
it looks like it's in the second location for a better reason:

Index: Makefile
================================================== =================
RCS file: /cvs/src/usr.sbin/Makefile,v
retrieving revision 1.121
diff -u -r1.121 Makefile
--- Makefile 17 Jun 2005 20:35:18 -0000 1.121
+++ Makefile 26 Jun 2005 22:47:21 -0000
@@ -3,7 +3,7 @@
.include <bsd.own.mk>

SUBDIR= ac accton adduser amd arp authpf bgpctl bgpd bind chroot \
- config cron dev_mkdb dhcpd dhcrelay edquota hostapd hotplugd \
+ config cron dev_mkdb dhcpd dhcrelay edquota hostapd \
httpd ifstated inetd iostat kgmon kvm_mkdb lpr mailwrapper mopd mtree \
mrouted mrinfo mtrace map-mbone netgroup_mkdb ntpd openssl \
ospfctl ospfd pkg_add popa3d portmap ppp pppd pppoe procmap \