Hi there,

I'm attempting to compile rbootd under FreeBSD 2.2.x.  I found the patch,
and attempted to apply it, and the patch failed.  Perhaps the rbootd I
have (from the 1.3.2 distribution) is different from the one the patch was
built against.  Is there another patch I should be using?

rmpproto version:
/*      $NetBSD: rmpproto.c,v 1.10 1997/10/18 11:23:16 lukem Exp $      */


patch I tried:

--- rmpproto.c.orig     Thu Apr  2 11:41:28 1998
+++ rmpproto.c  Thu Apr  2 18:35:46 1998
@@ -575,12 +575,8 @@
         */
        memmove((char *)&rconn->rmp.hp_hdr.daddr[0],
                (char *)&rconn->rmp.hp_hdr.saddr[0], RMP_ADDRLEN);
-#ifdef __FreeBSD__
-       /* BPF (incorrectly) wants this in host order. */
-       rconn->rmp.hp_hdr.len = rconn->rmplen - sizeof(struct hp_hdr);
-#else
+
        rconn->rmp.hp_hdr.len = htons(rconn->rmplen -
sizeof(structhp_hdr));
-#endif

        /*
         *  Reverse 802.2/HP Extended Source & Destination Access Pts.


What I get when I try to apply the patch:

Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- rmpproto.c.orig     Thu Apr  2 11:41:28 1998
|+++ rmpproto.c  Thu Apr  2 18:35:46 1998
--------------------------
Patching file rmpproto.c using Plan A...
Hunk #1 failed at 575.
1 out of 1 hunks failed--saving rejects to rmpproto.c.rej
done


Thanks.

regards,

Ben
--
Ben Hockenhull
benh@jpj.net