[SCM] Samba Shared Repository - branch master updated

Michael Adam obnox at samba.org
Fri Jun 10 05:25:21 MDT 2011

Hi Andrew,

Andrew Bartlett wrote:
> The branch, master has been updated
>        ...
>        via  ad0a07c s3-talloc Change TALLOC_ZERO_P() to talloc_zero()
>        ...
> commit ad0a07c531fadd1639c5298951cfaf5cfe0cb10e
> Author: Andrew Bartlett <abartlet at samba.org>
> Date:   Tue Jun 7 11:44:43 2011 +1000
>     s3-talloc Change TALLOC_ZERO_P() to talloc_zero()
>     Using the standard macro makes it easier to move code into common, as
>     TALLOC_ZERO_P isn't standard talloc.

You really need to be extremely careful with monster commits like
this, changing so many files.

E.g. Did you do this talloc hierarchy change intentionally:

diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index 80d8ed1..0e1750d 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -446,7 +446,7 @@ static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom)
                goto error;
-       config = TALLOC_ZERO_P(frame, struct autorid_global_config);
+       config = talloc_zero(dom, struct autorid_global_config);
        if (!config) {
                DEBUG(0, ("Out of memory!\n"));
                status = NT_STATUS_NO_MEMORY;

I guess this file had just changed between you writing the patch and
pushing the patch to autobuild.

In fact the chang would be correct, because my previous commit to
autobuild has an error. But I was wondering whether you noticed this
and fixed it in stealth mode, or if this was just accidentially "fixed"
unnoticed in conflict resolution...

Don't worry about changin the code, please: I am just changing/fixing
this code file anyways. But I was just curious because I stumbled
over this conflict when I now tried to rebase changes I made... :-)

Again, my lesson is: Try to change as little files in one
commit as possible.

Cheers - Michael

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 206 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20110610/cc6e7959/attachment.pgp>

More information about the samba-technical mailing list