diff --exclude=config.log --exclude='*.o' --exclude='*.a' --exclude='*~' --exclude=cscope.out --exclude='*.out' --exclude=getdate.c --exclude=getdate.h -burp samba-3.0.24.orig/source/auth/auth_util.c samba-3.0.24/source/auth/auth_util.c
--- samba-3.0.24.orig/source/auth/auth_util.c	2007-02-04 19:59:14.000000000 +0100
+++ samba-3.0.24/source/auth/auth_util.c	2007-02-26 11:19:55.736309000 +0100
@@ -1596,6 +1596,10 @@ struct passwd *smb_getpwnam( TALLOC_CTX 
 		p++;
 		fstrcpy( strip_username, p );
 		fstrcpy( username, strip_username );
+#if 1 /* Think of a "username = LONGUSERNAME" mapping in the username.map (for DOM\LONGUSERNAME) */
+		/* The name as used for SAM authentication may have been mapped locally */
+		map_username(username);
+#endif
 	}
 	
 	/* just lookup a plain username */