Start of merge to 2_2_RELEASE branch for release.

Jeremy.

1 files changed, 8 insertions, 8 deletions

diff --git a/source/lib/username.c b/source/lib/username.c
index 7ad2341d627..2bf289b6771 100644
--- a/source/lib/username.c
+++ b/source/lib/username.c
@@ -239,9 +239,9 @@ struct passwd *Get_Pwnam(char *user,BOOL allow_change)
 
 	/* try in all lower case first as this is the most
 	   common case on UNIX systems */
-	unix_to_dos(user, True);
+	unix_to_dos(user);
 	strlower(user);
-	dos_to_unix(user, True);
+	dos_to_unix(user);
 
 	ret = _Get_Pwnam(user);
 	if (ret)
@@ -260,9 +260,9 @@ struct passwd *Get_Pwnam(char *user,BOOL allow_change)
 	}
 
 	/* finally, try in all caps if that is a new case */
-	unix_to_dos(user, True);
+	unix_to_dos(user);
 	strupper(user);
-	dos_to_unix(user, True);
+	dos_to_unix(user);
 
 	if (strcmp(user, orig_username) != 0) {
 		ret = _Get_Pwnam(user);
@@ -271,9 +271,9 @@ struct passwd *Get_Pwnam(char *user,BOOL allow_change)
 	}
 
 	/* Try all combinations up to usernamelevel. */
-	unix_to_dos(user, True);
+	unix_to_dos(user);
 	strlower(user);
-	dos_to_unix(user, True);
+	dos_to_unix(user);
 
 	ret = uname_string_combinations(user, _Get_Pwnam, usernamelevel);
 
@@ -451,7 +451,7 @@ BOOL user_in_list(char *user,char *list)
 
 	while (next_token(&p,tok,LIST_SEP, sizeof(tok))) {
 
-		DEBUG(10,("user_in_list: checking user |%s| in group |%s|\n", user, tok));
+		DEBUG(10,("user_in_list: checking user |%s| against |%s|\n", user, tok));
 
 		/*
 		 * Check raw username.
@@ -524,7 +524,7 @@ BOOL user_in_list(char *user,char *list)
 			BOOL ret;
  
 			/* Check to see if name is a Windows group */
-			if (winbind_lookup_name(tok, &g_sid, &name_type) && name_type == SID_NAME_DOM_GRP) {
+			if (winbind_lookup_name(NULL, tok, &g_sid, &name_type) && name_type == SID_NAME_DOM_GRP) {
  
 				/* Check if user name is in the Windows group */
 				ret = user_in_winbind_group_list(user, tok, &winbind_answered);