> > > ---- Original message ---- >>Date: Fri, 14 Aug 2009 14:08:23 -0700 >>From: Quanah Gibson-Mount <qua...@zimbra.com> >>Subject: Re: RE24 testing for 2.4.18 (round 2) >>To: openldap-devel@openldap.org >> >>--On Wednesday, August 12, 2009 5:59 PM -0700 Quanah Gibson-Mount >><qua...@zimbra.com> wrote: >> >>> Please test RE24. >> >> >>A few more fixes, mainly back-meta, back-monitor, and slapo-translucent. >> > > I have the following in my libraries/libldap/os-ip.c: > > #ifdef TCP_KEEPCNT > <<<<<<< os-ip.c > if ( setsockopt( s, SOL_SOCKET, TCP_KEEPCNT, > ======= > if ( setsockopt( s, IPPROTO_TCP, TCP_KEEPCNT, >>>>>>>> 1.118.2.19 > > > I have no idea how others are posting successes...
You manually modified your source, and the subsequent CVS update resulted in a conflict. Please remove os-ip.c and re-update. p.
