[PATCH] Proposed merge of some NTLMSSP crypto

Andrew Bartlett abartlet at samba.org
Tue Dec 8 15:29:14 MST 2009


On Tue, 2009-12-08 at 21:37 +0100, Volker Lendecke wrote:
> On Wed, Dec 09, 2009 at 12:41:41AM +1100, Andrew Bartlett wrote:
> > In my git tree 'ntlmssp-merge-wip' I have the current state of my
> > efforts to merge the NTLMSSP code between Samba3 and Samba4.
> > 
> > My hope here is to reduce the duplication of the crypto code, and make
> > an eventual full merge of this important subsystem easier.
> > 
> > git://git.samba.org/abartlet/samba.git ntlmssp-merge-wip
> > 
> > The tests seem to pass in Samba4, but I still need to look into some
> > Samba3 issues.  It will be important to test with Windows clients too,
> > and any assistance in that area, particularly against Samba3 will be
> > most appreciated.
> 
> e8d4e5d3e260726c9 does not compile for me, does it for you?

Ahh, when I looked at this in gitk I misread the parent for the commit.
See the next commit. 

> Probably it is just too much to ask, but normally I try to
> make every commit in a sequence of commits at least compile.
> For me this makes future "git bisect" runs a lot easier. 

This patch series was split up for review, not git bisect.  As such, I
change the API and then follow up the callers in separate commits.  (The
double-change to the API is unfortunate, but due to development order
was not trivial to merge with the previous commit that made the first
change). 

Similarly I moved the code and made syntactic changes before concluding
the merge with the semantic changes.  As such, only the tip of the tree
is expected to compile and operate, not each individual patch. 

We may be able to merge some of these commits before a final push, but I
wanted to make it crystal clear what code was as was not being modified
by this merge. 

Andrew Bartlett

-- 
Andrew Bartlett                                http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org
Samba Developer, Cisco Inc.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20091209/2983b5a1/attachment.pgp>


More information about the samba-technical mailing list