--- samba-3.0.24/source/smbd/sesssetup.c	2007-02-05 03:59:13.000000000 +0900
+++ samba-3.0.24.osstech/source/smbd/sesssetup.c	2007-04-07 02:53:13.754396460 +0900
@@ -691,6 +691,11 @@ static int reply_sesssetup_and_X_spnego(
 		native_os, native_lanman, primary_domain));
 
 	if ( ra_type == RA_WIN2K ) {
+		/* Vista sets neither the OS or lanman strings */
+
+		if ( !strlen(native_os) && !strlen(native_lanman) )
+			set_remote_arch(RA_VISTA);
+		
 		/* Windows 2003 doesn't set the native lanman string, 
 		   but does set primary domain which is a bug I think */