CVS update: samba/source/lib

[John H Terpstra]

On Sat, 14 Sep 2002, Andrew Bartlett wrote:

> Andrew Bartlett wrote:
> >
> > jht at samba.org wrote:
> > >
> > > Date:   Sat Sep 14 03:31:40 2002
> > > Author: jht
> > >
> > > Update of /data/cvs/samba/source/lib
> > > In directory dp.samba.org:/tmp/cvs-serv18898
> > >
> > > Added Files:
> > >       Tag: SAMBA_2_2
> > >         sendfile.c
> > > Log Message:
> > > Added sendfile.c from HEAD branch.
> >
> > WHY?  With 2.2.6 being a bugfix release, do we really want to be playing
> > with sendfile here?  It just seems to be an easy way to ensure we must
> > put out a 2.2.7...

I just added sendfile so I could compile 2.2.6. I incorrectly assumed it
was meant to go in since someone went to the trouble of updating the
Makefile.

>
> Now I see the problem - jra merged a bit too much from APPLIANCE_HEAD,
> and forgot to remove sendfile.o from the Makefile.in before the merge

That's one way to explain the event - and no doubt the correct way. I
assumed!

>
> http://build.samba.org/?function=diff&tree=samba_2_2&date=1031960785&author=jra
>
> jra assured me that he wasn't doing sendfile in 2.2...

Ok. So have you reversed my add? It seems to work OK.

- John T.

-- 
John H Terpstra
Email: jht at samba.org