summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-09-21 02:06:44 +0200
committerMichael Adam <obnox@samba.org>2008-09-23 10:00:26 +0200
commit4205fab500927a4248fda622e1c338b7e791617f (patch)
tree5fbe871bab75361cca8396e338b49dd1666bf67b
parent49145bfefae54672c5d4cccdbb9dd33e1cd89b88 (diff)
downloadsamba-4205fab500927a4248fda622e1c338b7e791617f.tar.gz
samba-4205fab500927a4248fda622e1c338b7e791617f.tar.bz2
samba-4205fab500927a4248fda622e1c338b7e791617f.zip
[s3]winbindd_group: sanely handle NULL domain in add_member().
Michael
-rw-r--r--source3/winbindd/winbindd_group.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/winbindd/winbindd_group.c b/source3/winbindd/winbindd_group.c
index 088f946877..b2bba09537 100644
--- a/source3/winbindd/winbindd_group.c
+++ b/source3/winbindd/winbindd_group.c
@@ -35,7 +35,11 @@ static void add_member(const char *domain, const char *user,
{
fstring name;
- fill_domain_username(name, domain, user, True);
+ if (domain != NULL) {
+ fill_domain_username(name, domain, user, True);
+ } else {
+ fstrcpy(name, user);
+ }
safe_strcat(name, ",", sizeof(name)-1);
string_append(pp_members, name);
*p_num_members += 1;