[PATCH] Simplify auth_check_ntlm_password

Andreas Schneider asn at samba.org
Wed Mar 8 07:21:53 UTC 2017


On Wednesday, 8 March 2017 05:59:59 CET Jeremy Allison wrote:
> On Tue, Mar 07, 2017 at 08:54:04PM -0800, Jeremy Allison wrote:
> > 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 ?
> 
> FYI, In case I'm not being direct enough - I
> *really* *do* want the logging patchset finished :-),
> and I'll do the work to rebase it for you guys
> this time so it works on top of master+vl-cleanup
> (but please learn to do it yourselves for next
> time please).
> 
> Can you send me an idiot-proof 'cut-and-paste'
> command set I can use to make sure I get the
> guarenteed correct code you want me to rebase ?
> 
> It won't take me long to get something useful
> for you once I know I'm working on the right
> code :-).

Wow, if I just had known this earlier. I would have let *you* do all the 
rebases of the master-mit-kdc branch over the last years.

I didn't know what you offer these rebase services!



-- 
Andreas Schneider                   GPG-ID: CC014E3D
Samba Team                             asn at samba.org
www.samba.org



More information about the samba-technical mailing list