diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-11 03:12:21 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-11 03:12:21 +0200 |
| commit | 0fd0fc75c46b39a611c7f9a56081105714d73e36 (patch) | |
| tree | b93ef5e67e49a3aa49c37e13df3d6222b2df7095 /source3/winbindd/winbindd_rpc.c | |
| parent | 69d38a95c29498c0266cb98b911faa3e7240c787 (diff) | |
| parent | 47f7ef8f39ba482a7d6578ab82c9e0670381c4f8 (diff) | |
| download | samba-0fd0fc75c46b39a611c7f9a56081105714d73e36.tar.gz samba-0fd0fc75c46b39a611c7f9a56081105714d73e36.tar.bz2 samba-0fd0fc75c46b39a611c7f9a56081105714d73e36.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into selftest
Conflicts:
selftest/selftest.pl
Diffstat (limited to 'source3/winbindd/winbindd_rpc.c')
| -rw-r--r-- | source3/winbindd/winbindd_rpc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c index df80ad8029..9fbea8e45b 100644 --- a/source3/winbindd/winbindd_rpc.c +++ b/source3/winbindd/winbindd_rpc.c @@ -854,7 +854,10 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain, } for (r=0; r<tmp_names.count; r++) { - (*names)[i+r] = CONST_DISCARD(char *, tmp_names.names[r].string); + (*names)[i+r] = fill_domain_username_talloc(mem_ctx, + domain->name, + tmp_names.names[r].string, + true); (*name_types)[i+r] = tmp_types.ids[r]; } |