Samba4: idmap replication between 2 DC's

[steve]

Sorry, I posted to the wrong thread.

On 22/07/12 14:38, steve wrote:
> On 13/07/12 00:52, Andrew Bartlett wrote:
>> On Thu, 2012-07-12 at 15:36 +0200, Gémes Géza wrote:
>>> 2012-07-12 15:22 keltezéssel, Andrew Bartlett írta:
>>>> On Thu, 2012-07-12 at 15:14 +0200, Michael Adam wrote:
>>>>> Andrew Bartlett wrote:
>>>>>> Gémes,
>
> Hi
> Is this now in master?
>
> Having changed at source4/winbind/idmap.c to:
>
> --- a/source4/winbind/idmap.c    2012-06-21 12:54:38.000000000 +0400
> +++ b/source4/winbind/idmap.c    2012-07-19 15:41:31.039544144 +0400
> @@ -458,7 +458,7 @@
>           goto failed;
>       } else if (ret == LDB_SUCCESS) {
>           uint32_t account_type = ldb_msg_find_attr_as_uint(sam_msg,
> "sAMaccountType", 0);
> -        if (account_type & ATYPE_ACCOUNT) {
> +        if (account_type == ATYPE_ACCOUNT) {
>               const struct ldb_val *v = ldb_msg_find_ldb_val(sam_msg,
> "uidNumber");
>               if (v) {
>                   unixid->type = ID_TYPE_UID;
>
> I now get:
> git pull
> remote: Counting objects: 20, done.
> remote: Compressing objects: 100% (12/12), done.
> remote: Total 12 (delta 10), reused 0 (delta 0)
> Unpacking objects: 100% (12/12), done.
>  From git://git.samba.org/samba
>     f7b88fb..e2cea8f  master     -> origin/master
> Updating f7b88fb..e2cea8f
> error: Your local changes to the following files would be overwritten by
> merge:
>      source4/winbind/idmap.c
> Please, commit your changes or stash them before you can merge.
> Aborting
>
> If I delete source4/winbind/idmap.c and take the new checkout and use:
>   idmap_ldb:use rfc2307 = Yes
> In smb.conf
> then pulling uidNumber and gidNumber from AD no longer work.
>
> Is there a way of finding out Whether Sergey's patch has been applied?
>
> Cheers,
> Steve