From 8940fd09a67c79d73712e2dd4b197fffd613dd04 Mon Sep 17 00:00:00 2001 From: "Gerald W. Carter" Date: Mon, 31 Mar 2008 14:33:53 -0500 Subject: Patch from Nicholas Brealey to distinguish between WinXP and WinXP64. Defines a new value for the %a variable when detecting a Windows XP 64-bit client. (This used to be commit 0c94918fb52c5345ce30490046b79f81712c30bf) --- source3/include/smb.h | 2 +- source3/lib/util.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'source3') diff --git a/source3/include/smb.h b/source3/include/smb.h index bf9ca6b92c..4d18dc594f 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1571,7 +1571,7 @@ enum ldap_passwd_sync_types {LDAP_PASSWD_SYNC_ON, LDAP_PASSWD_SYNC_OFF, LDAP_PAS /* Remote architectures we know about. */ enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT, RA_WIN2K, RA_WINXP, RA_WIN2K3, RA_VISTA, - RA_SAMBA, RA_CIFSFS}; + RA_SAMBA, RA_CIFSFS, RA_WINXP64}; /* case handling */ enum case_handling {CASE_LOWER,CASE_UPPER}; diff --git a/source3/lib/util.c b/source3/lib/util.c index dba7142bad..00062b82a9 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -2057,7 +2057,7 @@ 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 ); + set_remote_arch( RA_WINXP64 ); else if ( strcmp( native_lanman, "Windows Server 2003 5.2" ) == 0 ) set_remote_arch( RA_WIN2K3 ); } @@ -2098,6 +2098,9 @@ void set_remote_arch(enum remote_arch_types type) case RA_WINXP: remote_arch_str = "WinXP"; break; + case RA_WINXP64: + remote_arch_str = "WinXP64"; + break; case RA_WIN2K3: remote_arch_str = "Win2K3"; break; -- cgit