Working to merge charcnv

Andrew Bartlett abartlet at samba.org
Thu Mar 19 22:01:27 GMT 2009


On Thu, 2009-03-19 at 16:59 +0100, Stefan (metze) Metzmacher wrote:
> Andrew Bartlett schrieb:
> > Having realised that the bulk of the work for the libcli/auth merge is
> > actually in the charcnv code, I've cherry-picked these patches and
> > placed them in:
> > 
> > http://gitweb.samba.org/?p=abartlet/samba.git/.git;a=shortlog;h=refs/heads/charcnv-merge
> 
> thanks, but please use rebase later:-)
> It's nice to see all your commits on top in gitweb. (In the
> libcli-auth-merge branch it's much harder to find the older commits)

Because I use multiple workstations, I cannot rebase except on the first
push from the private to public repository.  

> > I've yet to follow up on Volker's talloc_stackframe suggestions, but
> > will do so where appropriate in due course (patches welcome :-).
> 
> I think a few people should carefully review the changes (I'll
> try to do that tomorrow) before you push that.

Thanks. 

> > Once this is merged, I hope to restart on the libcli/auth merge.
> 
> Thanks for all the merge work!

No worries!  It has been a very interesting experience.

Andrew Bartlett

-- 
Andrew Bartlett
http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org
Samba Developer, Red Hat 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/archive/samba-technical/attachments/20090320/1633a17b/attachment.bin


More information about the samba-technical mailing list