- changed smb_getpwnam() to use winbind style usernames

- finished ntdom -> winbind rename in head
(This used to be commit ada483cb56453afc6df4ec4be18bfe5e943c7150)

1 files changed, 6 insertions, 7 deletions

diff --git a/source3/lib/username.c b/source3/lib/username.c
index 2839ddab3d..2620d74eba 100644
--- a/source3/lib/username.c
+++ b/source3/lib/username.c
@@ -429,19 +429,18 @@ static struct passwd * uname_string_combinations(char *s,struct passwd * (*fn)(c
 these wrappers allow appliance mode to work. In appliance mode the username
 takes the form DOMAIN/user
 ****************************************************************************/
-struct passwd *smb_getpwnam(char *user, char *domain, BOOL allow_change)
+struct passwd *smb_getpwnam(char *user, BOOL allow_change)
 {
 	struct passwd *pw;
-	fstring userdom;
+	char *p;
 
 	pw = Get_Pwnam(user, allow_change);
-	if (pw || !domain || !*domain) return pw;
-
-	slprintf(userdom, sizeof(userdom), "%s/%s", domain, user);
+	if (pw) return pw;
 
-	DEBUG(4,("smb_getpwnam trying userdom %s\n", userdom));
+	p = strchr(user,'/');
+	if (p) return Get_Pwnam(p+1, allow_change);
 
-	return Get_Pwnam(userdom, allow_change);
+	return NULL;
 }
 
 int smb_initgroups(char *user, char *domain, gid_t group)