diff options
author | Jeremy Allison <jra@samba.org> | 2001-12-05 04:17:39 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2001-12-05 04:17:39 +0000 |
commit | f8abe6eba4cf77eae9306a0fa3b2c7b5d115fd58 (patch) | |
tree | 6e79fbf227c5f9603d44f1d776520ab208451bf6 /source3/nsswitch/winbindd_user.c | |
parent | cf90455854b2ad71a0b5aca2fcba84113ec1452a (diff) | |
download | samba-f8abe6eba4cf77eae9306a0fa3b2c7b5d115fd58.tar.gz samba-f8abe6eba4cf77eae9306a0fa3b2c7b5d115fd58.tar.bz2 samba-f8abe6eba4cf77eae9306a0fa3b2c7b5d115fd58.zip |
Fixed parse_domain_user to be bool.
Jeremy.
(This used to be commit 9563de2ef8c1197f4941671d2fdade7d933c32d0)
Diffstat (limited to 'source3/nsswitch/winbindd_user.c')
-rw-r--r-- | source3/nsswitch/winbindd_user.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source3/nsswitch/winbindd_user.c b/source3/nsswitch/winbindd_user.c index c8d9ce299f..52122a4f29 100644 --- a/source3/nsswitch/winbindd_user.c +++ b/source3/nsswitch/winbindd_user.c @@ -65,7 +65,10 @@ static BOOL winbindd_fill_pwent(char *domain_name, char *name, defaults are /tmp for the home directory and /bin/false for shell. */ - parse_domain_user(name, name_domain, name_user); + if (!parse_domain_user(name, name_domain, name_user)) { + DEBUG(1, ("error parsing domain user for %s\n", name_user )); + return False; + } /* The substitution of %U and %D in the 'template homedir' is done by lp_string() calling standard_sub_basic(). */ @@ -113,13 +116,8 @@ enum winbindd_result winbindd_getpwnam_from_user(struct winbindd_cli_state *stat /* 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)) return WINBINDD_ERROR; if ((domain = find_domain_from_name(name_domain)) == NULL) { |