okay, pb solved, i just reused a stable tree to populate a current tree
thanks again
On Nov 10, 2007 4:14 PM, Kenneth R Westerback <[EMAIL PROTECTED]> wrote:
>
> On Sat, Nov 10, 2007 at 03:31:03PM +0100, Vincent GROSS wrote:
> > Hi folks,
> >
> > there seem to be a lil' problem with /usr/src/usr/sbin/dhcpd/options.c.
> > the following patch highlights two weirds constructs inside the file,
> > one in the header, the other one in the MMS checking code.
> >
> > --- /usr/src/usr.sbin/dhcpd/options.c Sat Nov 10 04:53:05 2007
> > +++ ./options.c Sat Nov 10 15:17:50 2007
> > @@ -1,8 +1,4 @@
> > -<<<<<<< options.c
> > -/* $OpenBSD: options.c,v 1.8.4.1 2007/10/10 06:10:27 ckuethe Exp $ */
> > -=======
> > /* $OpenBSD: options.c,v 1.19 2007/10/29 16:51:02 krw Exp $ */
> > ->>>>>>> 1.19
> >
> > /* DHCP options parsing and reassembly. */
> >
> > @@ -279,13 +275,9 @@
> > sizeof(u_int16_t))) {
> > mms = getUShort(
> > inpacket->options[DHO_DHCP_MAX_MESSAGE_SIZE].data);
> > -<<<<<<< options.c
> > if (mms < 576)
> > mms = 576; /* mms must be >= minimum IP MTU */
> > }
> > -=======
> > - }
> > ->>>>>>> 1.19
> >
> > if (mms) {
> > if (mms < 576)
> >
> > this is the resulting diff of the changes I made, IT IS NOT AN
> > OFFICIAL PATCH, USE IT AT YOUR OWN RISKS !
> >
> > Cheers,
> >
> > --
> > Vincent GROSS
> > "GUIs normally make it simple to accomplish simple actions and
> > impossible to accomplish complex actions." --Doug Gwyn (22/Jun/91 in
> > comp.unix.wizards)
> >
>
> Not sure what you think the problem is. You're apparently comparing
> -stable and -current sources. Can you explain exactly what problem
> you see?
>
> .... Ken
>
--
Vincent GROSS
"GUIs normally make it simple to accomplish simple actions and
impossible to accomplish complex actions." --Doug Gwyn (22/Jun/91 in
comp.unix.wizards)
