Hi Metze, On Sun, 2007-10-14 at 17:57 +0200, Stefan (metze) Metzmacher wrote: > Jelmer Vernooij schrieb: > > The branch, v3-2-test has been updated > > via 2762205ee7bcf5da71f433f86e9c667fd65ee228 (commit) > > via 9394d0cc16537ae8ee207528c2e74cb8a420c64d (commit) > > via 84660aaab02338f22669bdf20af0f98607b6db17 (commit) > > via 3072b11ac42a7d89252599bdbbf9d8515b034a8d (commit) > > via ec804f18eda896b2bda3682bf68becfc0d3ee92b (commit) > > via 9703aa291290c42762e8505e076b7aae92fbf8c0 (commit) > > via 06bbcd72d8b5a7a53e79e029818944298ad03e64 (commit) > > via c711f33a918433f171b9711ae0db6678e4d6badc (commit) > > from 5e95c548864bc8b075b8343e69a69e1a22c92456 (commit) > > > > http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test > > > > > > - Log ----------------------------------------------------------------- > > commit 2762205ee7bcf5da71f433f86e9c667fd65ee228 > > Merge: 9394d0cc16537ae8ee207528c2e74cb8a420c64d > > 5e95c548864bc8b075b8343e69a69e1a22c92456 > > Author: Jelmer Vernooij <[EMAIL PROTECTED]> > > Date: Sun Oct 14 00:18:01 2007 +0200 > > > > Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into > > 3.2-trivial > > > > commit 9394d0cc16537ae8ee207528c2e74cb8a420c64d > > Merge: 84660aaab02338f22669bdf20af0f98607b6db17 > > ec804f18eda896b2bda3682bf68becfc0d3ee92b > > Author: Jelmer Vernooij <[EMAIL PROTECTED]> > > Date: Sat Oct 13 23:52:11 2007 +0200 > > > > Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/jelmer/samba > > into 3.2-trivial > > > > commit 84660aaab02338f22669bdf20af0f98607b6db17 > > Author: Jelmer Vernooij <[EMAIL PROTECTED]> > > Date: Sat Oct 13 23:39:46 2007 +0200 > > > > Ignore vim backup files. > > > > commit 3072b11ac42a7d89252599bdbbf9d8515b034a8d > > Author: Jelmer Vernooij <[EMAIL PROTECTED]> > > Date: Sat Oct 13 23:36:16 2007 +0200 > > > > Fix typo. > > > > commit ec804f18eda896b2bda3682bf68becfc0d3ee92b > > Author: Jelmer Vernooij <[EMAIL PROTECTED]> > > Date: Sat Oct 13 18:33:43 2007 +0200 > > > > Update copy of lib/util, fix remove some duplicates. > > > > commit 9703aa291290c42762e8505e076b7aae92fbf8c0 > > Author: Jelmer Vernooij <[EMAIL PROTECTED]> > > Date: Sat Oct 13 18:26:35 2007 +0200 > > > > Fix typo. > > > > commit 06bbcd72d8b5a7a53e79e029818944298ad03e64 > > Author: Jelmer Vernooij <[EMAIL PROTECTED]> > > Date: Fri Oct 12 20:37:27 2007 +0200 > > > > Remove some Samba 3 code, now provided by lib/util > > > > commit c711f33a918433f171b9711ae0db6678e4d6badc > > Author: Jelmer Vernooij <[EMAIL PROTECTED]> > > Date: Fri Oct 12 19:47:06 2007 +0200 > > > > Import lib/util from Samba 4
> I'm not sure it's that easy to use samba4's lib/util/ > is it really a superset of the samba3 code? > > I noticed (thanks to Björn) that we're missing some changes > from getpass.c which get lost when I backported lib/replace > and that told me we need to be more careful with backporting stuff. > > (I'm not sure, but maybe you didn't wanted to push this stuff, > it ended somehow up in your 3-2-trivial branch, where there's also > a 3-2-util branch...) Yes, this was accidently pushed (me being a git n00b...). I reverted it last night and only pushed the two one-liners that were in my 3.2-trivial branch instead. I do hope to eventually end up merging this, but that may take a while. I'll make sure all of the Samba 3 fixes get into Samba 4 first before doing so. Cheers, Jelmer -- Jelmer Vernooij <[EMAIL PROTECTED]> - http://samba.org/~jelmer/ Jabber: [EMAIL PROTECTED]
