summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2001-10-14 08:31:54 +0000
committerTim Potter <tpot@samba.org>2001-10-14 08:31:54 +0000
commitf2d595e262a5140c04d26b68818e005532c0b3c1 (patch)
tree37415bfe909af4f2728260ce3f5273f00dbd21d8
parent0536ceee2f22fcef71471cf6c87e2a2940d1d622 (diff)
downloadsamba-f2d595e262a5140c04d26b68818e005532c0b3c1.tar.gz
samba-f2d595e262a5140c04d26b68818e005532c0b3c1.tar.bz2
samba-f2d595e262a5140c04d26b68818e005532c0b3c1.zip
Some reformatting.
(This used to be commit 5fc97e72ebf5976d66345107f3d9e6d3ae27eb94)
-rw-r--r--source3/nsswitch/winbindd_util.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 3998c4d2bd..859b0850dc 100644
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -508,9 +508,8 @@ BOOL winbindd_param_init(void)
/* Parse winbind uid and winbind_gid parameters */
if (!(parse_id_list(lp_winbind_uid(), True) &&
- parse_id_list(lp_winbind_gid(), False))) {
+ parse_id_list(lp_winbind_gid(), False)))
return False;
- }
/* Check for reversed uid and gid ranges */
@@ -559,9 +558,8 @@ BOOL check_domain_env(char *domain_env, char *domain)
char *tmp = domain_env;
while(next_token(&tmp, name, ",", sizeof(fstring))) {
- if (strequal(name, domain)) {
+ if (strequal(name, domain))
return True;
- }
}
return False;
@@ -573,9 +571,15 @@ void parse_domain_user(char *domuser, fstring domain, fstring user)
{
char *p;
char *sep = lp_winbind_separator();
- if (!sep) sep = "\\";
+
+ if (!sep)
+ sep = "\\";
+
p = strchr(domuser,*sep);
- if (!p) p = strchr(domuser,'\\');
+
+ if (!p)
+ p = strchr(domuser,'\\');
+
if (!p) {
fstrcpy(domain,"");
fstrcpy(user, domuser);