[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-564-g0c94918

[Gerald Carter]

The branch, v3-2-test has been updated
       via  0c94918fb52c5345ce30490046b79f81712c30bf (commit)
      from  c4f248df8e34c6a028bf8d789fe9763b0ea063fe (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 0c94918fb52c5345ce30490046b79f81712c30bf
Author: Gerald W. Carter <jerry at samba.org>
Date:   Mon Mar 31 14:33:53 2008 -0500

    Patch from Nicholas Brealey <nick at brealey.org> to distinguish between WinXP and WinXP64.
    
    Defines a new value for the %a variable when detecting a Windows XP 64-bit client.

-----------------------------------------------------------------------

Summary of changes:
 source/include/smb.h |    2 +-
 source/lib/util.c    |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/smb.h b/source/include/smb.h
index bf9ca6b..4d18dc5 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 dba7142..00062b8 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;


-- 
Samba Shared Repository