[PATCH] Simplify auth_check_ntlm_password

Jeremy Allison jra at samba.org
Wed Mar 8 04:54:04 UTC 2017


On Wed, Mar 08, 2017 at 04:02:53PM +1300, Andrew Bartlett wrote:
> > I didn't fix the 'static' issue as I only wanted to show your
> > exact code on top of what I'm proposing to push.
> > 
> > I haven't compiled it yet :-).
> > 
> > Doing the rebase really isn't that hard - it'd be good for
> > Gary to learn this skill now rather than later !
> 
> Thanks for trying.  Sadly it looks like our repo and what you rebased
> have already diverged, and I can't make much sense of it.  I've tried a
> number of tacks, but I'm going to have to ask you take a look at it
> again later, as I'm just loosing time.

What ? I just did a git clone of your repo, did a git checkout of
the branch you specified and then rebased the code from that on top
of the master branch with Volker's patch applied.

e.g.

git clone git://git.catalyst.net.nz/samba.git auth-logging-ntlm
cd auth-logging-ntlm
git checkout auth-logging-ntlm

Then did the rebase work. Did I misunderstand
how to get the correct code you're working
on ?

As I said, it took about 10 minutes. Did
I screw up getting the right code ?

If you have a current master, you should
now be able to do:

git am /tmp/vl-patch
git am /tmp/rebase-log-patch1

and you should end up with your patchset
(rebase-log-patch1) on top of Volker's.

I'll try and take a look tomorrow when
I'm back in at work, but this is a problem
rebasing on a changing master) that your
team will need to learn to cope with going
forward because it will keep happening with
large out-of-tree patchsets.

As a procedural issue we've never really
allowed people to 'reserve' an area of
code as being worked on unless there are
extreme (i.e. security) circumstances. I
don't think this is good engineering practice
either. Once a patch is ready and reviewed,
it's the responsibility of the out-of-tree code
maintainer to rebase on top of what goes
into master.

Volker's patchset is simple, clean and
does a cleanup of the function it works
on, so I really think it needs to go in
first, and your logging patchset should
be rebased on top.

Jeremy.



More information about the samba-technical mailing list