From: Gerald W. Carter <jerry@samba.org>
Date: Mon, 31 Mar 2008 19:33:53 +0000 (-0500)
Subject: Patch from Nicholas Brealey <nick@brealey.org> to distinguish between WinXP and WinXP64.
X-Git-Tag: samba-3.3.0pre1~2990
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c94918fb52c5345ce30490046b79f81712c30bf;p=thirdparty%2Fsamba.git

Patch from Nicholas Brealey <nick@brealey.org> to distinguish between WinXP and WinXP64.

Defines a new value for the %a variable when detecting a Windows XP 64-bit client.
---

diff --git a/source/include/smb.h b/source/include/smb.h
index bf9ca6b92ca..4d18dc594fc 100644
--- a/source/include/smb.h
+++ b/source/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/source/lib/util.c b/source/lib/util.c
index dba7142bad3..00062b82a9d 100644
--- a/source/lib/util.c
+++ b/source/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;