From 3a0e9a54620282e3d1765b4ceb175e2eb7f0dd9c Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 5 Feb 2007 15:04:09 +0000 Subject: r21149: Only say we are a groupmember for the optimized (rid 513) membership lookup when we actually are. Although the Linux nss winbind backend protects against num_mem != 0 && buf == NULL. Guenther (This used to be commit a9ac4630b46242f88bd7a4e92511b55cc82e9940) --- source3/nsswitch/winbindd_group.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source3') diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c index 51d595b947..4215aef5dd 100644 --- a/source3/nsswitch/winbindd_group.c +++ b/source3/nsswitch/winbindd_group.c @@ -221,6 +221,7 @@ static BOOL fill_grent_mem(struct winbindd_domain *domain, DEBUG(10, ("group SID %s\n", sid_to_string(sid_string, group_sid))); + /* Initialize with no members */ *num_gr_mem = 0; /* HACK ALERT!! This whole routine does not cope with group members @@ -340,11 +341,13 @@ static BOOL fill_grent_mem(struct winbindd_domain *domain, DEBUG(10,("fill_grent_mem: user %s in 'Domain Users' in domain %s\n", name, domain->name )); + + /* user is the only member */ + *num_gr_mem = 1; } *gr_mem = buf; *gr_mem_len = buf_len; - *num_gr_mem = 1; DEBUG(10, ("num_mem = %u, len = %u, mem = %s\n", (unsigned int)*num_gr_mem, (unsigned int)buf_len, *num_gr_mem ? buf : "NULL")); -- cgit