diff options
| author | Michael Adam <obnox@samba.org> | 2008-09-22 10:39:37 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-11-26 10:13:41 +0100 |
| commit | f071ee1c853caab5ac99332e09a810d031ec3666 (patch) | |
| tree | 4055c9e1bc48501edfacc576e8aecf0495f637d0 | |
| parent | a31e0490af0f22c07c1935435898dcea26773897 (diff) | |
| download | samba-f071ee1c853caab5ac99332e09a810d031ec3666.tar.gz | |
winbindd_ads: honour "winbind use default domain" in lookup_groupmem().
This fixes the output of "getent group" when "winbind use default domain = yes"
with security = ads.
Michael
(cherry picked from commit 39e04a65056d3c82ede8c283918e4dc505875b63)
| -rw-r--r-- | source/winbindd/winbindd_ads.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/source/winbindd/winbindd_ads.c b/source/winbindd/winbindd_ads.c index 5f59ef35a00..18cc1cbd038 100644 --- a/source/winbindd/winbindd_ads.c +++ b/source/winbindd/winbindd_ads.c @@ -1044,10 +1044,11 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain, DEBUG(10,("ads: lookup_groupmem: got sid %s from " "cache\n", sid_string_dbg(&sid))); sid_copy(&(*sid_mem)[*num_names], &sid); - (*names)[*num_names] = talloc_asprintf(*names, "%s%c%s", - domain_name, - *lp_winbind_separator(), - name ); + (*names)[*num_names] = fill_domain_username_talloc( + *names, + domain_name, + name, + true); (*name_types)[*num_names] = name_type; (*num_names)++; @@ -1092,11 +1093,12 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain, { sid_copy(&(*sid_mem)[*num_names], &sid_mem_nocache[i]); - (*names)[*num_names] = talloc_asprintf( *names, - "%s%c%s", - domains_nocache[i], - *lp_winbind_separator(), - names_nocache[i] ); + (*names)[*num_names] = + fill_domain_username_talloc( + *names, + domains_nocache[i], + names_nocache[i], + true); (*name_types)[*num_names] = name_types_nocache[i]; (*num_names)++; } |