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_util.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_util.c')
-rw-r--r-- | source3/nsswitch/winbindd_util.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index d91b6cc95f..d49e0b5bc2 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -640,27 +640,16 @@ BOOL check_domain_env(char *domain_env, char *domain) /* Parse a string of the form DOMAIN/user into a domain and a user */ -void parse_domain_user(const char *domuser, fstring domain, fstring user) +BOOL parse_domain_user(const char *domuser, fstring domain, fstring user) { - char *p; - char *sep = lp_winbind_separator(); + char *p = strchr(domuser,*lp_winbind_separator()); - if (!sep) - sep = "\\"; - - p = strchr(domuser,*sep); - - if (!p) - p = strchr(domuser,'\\'); - - if (!p) { - fstrcpy(domain,""); - fstrcpy(user, domuser); - return; - } + if (!p) + return False; fstrcpy(user, p+1); fstrcpy(domain, domuser); domain[PTR_DIFF(p, domuser)] = 0; strupper(domain); + return True; } |