Author: jerry Date: 2007-02-09 19:41:09 +0000 (Fri, 09 Feb 2007) New Revision: 21262
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21262 Log: Final part of BUG 4093: fix %a with Windows XP 64bit Modified: branches/SAMBA_3_0/source/lib/util.c branches/SAMBA_3_0_25/source/lib/util.c Changeset: Modified: branches/SAMBA_3_0/source/lib/util.c =================================================================== --- branches/SAMBA_3_0/source/lib/util.c 2007-02-09 17:35:32 UTC (rev 21261) +++ branches/SAMBA_3_0/source/lib/util.c 2007-02-09 19:41:09 UTC (rev 21262) @@ -2129,6 +2129,7 @@ /******************************************************************* we distinguish between 2K and XP by the "Native Lan Manager" string WinXP => "Windows 2002 5.1" + WinXP 64bit => "Windows XP 5.2" Win2k => "Windows 2000 5.0" NT4 => "Windows NT 4.0" Win9x => "Windows 4.0" @@ -2137,9 +2138,11 @@ ********************************************************************/ void ra_lanman_string( const char *native_lanman ) -{ +{ if ( strcmp( native_lanman, "Windows 2002 5.1" ) == 0 ) set_remote_arch( RA_WINXP ); + else if ( strcmp( native_lanman, "Windows XP 5.2" ) == 0 ) + set_remote_arch( RA_WINXP ); else if ( strcmp( native_lanman, "Windows Server 2003 5.2" ) == 0 ) set_remote_arch( RA_WIN2K3 ); } Modified: branches/SAMBA_3_0_25/source/lib/util.c =================================================================== --- branches/SAMBA_3_0_25/source/lib/util.c 2007-02-09 17:35:32 UTC (rev 21261) +++ branches/SAMBA_3_0_25/source/lib/util.c 2007-02-09 19:41:09 UTC (rev 21262) @@ -2129,6 +2129,7 @@ /******************************************************************* we distinguish between 2K and XP by the "Native Lan Manager" string WinXP => "Windows 2002 5.1" + WinXP 64bit => "Windows XP 5.2" Win2k => "Windows 2000 5.0" NT4 => "Windows NT 4.0" Win9x => "Windows 4.0" @@ -2137,9 +2138,11 @@ ********************************************************************/ void ra_lanman_string( const char *native_lanman ) -{ +{ if ( strcmp( native_lanman, "Windows 2002 5.1" ) == 0 ) set_remote_arch( RA_WINXP ); + else if ( strcmp( native_lanman, "Windows XP 5.2" ) == 0 ) + set_remote_arch( RA_WINXP ); else if ( strcmp( native_lanman, "Windows Server 2003 5.2" ) == 0 ) set_remote_arch( RA_WIN2K3 ); }
