From f8abe6eba4cf77eae9306a0fa3b2c7b5d115fd58 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 5 Dec 2001 04:17:39 +0000 Subject: Fixed parse_domain_user to be bool. Jeremy. (This used to be commit 9563de2ef8c1197f4941671d2fdade7d933c32d0) --- source3/nsswitch/winbindd_group.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'source3/nsswitch/winbindd_group.c') diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c index d800456d9d..b03e506494 100644 --- a/source3/nsswitch/winbindd_group.c +++ b/source3/nsswitch/winbindd_group.c @@ -210,12 +210,7 @@ enum winbindd_result winbindd_getgrnam_from_group(struct winbindd_cli_state *sta memset(name_group, 0, sizeof(fstring)); tmp = state->request.data.groupname; - parse_domain_user(tmp, name_domain, name_group); - - /* Reject names that don't have a domain - i.e name_domain contains - the entire name. */ - - if (strequal(name_group, "")) + if (!parse_domain_user(tmp, name_domain, name_group)) return WINBINDD_ERROR; /* Get info for the domain */ @@ -934,13 +929,8 @@ enum winbindd_result winbindd_getgroups(struct winbindd_cli_state *state) /* Parse domain and username */ - parse_domain_user(state->request.data.username, name_domain, - name_user); - - /* Reject names that don't have a domain - i.e name_domain contains - the entire name. */ - - if (strequal(name_domain, "")) + if (!parse_domain_user(state->request.data.username, name_domain, + name_user)) goto done; /* Get info for the domain */ -- cgit