bzr commit into connector-net-trunk branch (reggie.burnett:967)

[Reggie Burnett]

#At file:///C:/Users/Reggie/work/connector-net/trunk/ based on revid:reggie.burnett@stripped

  967 Reggie Burnett	2011-03-31
      updating changelog and fixing a couple of compile errors after merging in windows auth code

    modified:
      CHANGES
      MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs
      MySql.Data/Provider/Source/NativeDriver.cs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2011-03-09 18:20:41 +0000
+++ b/CHANGES	2011-03-31 17:29:29 +0000
@@ -1,2 +1,3 @@
 6.4.0
 - Implemented Cache Server Properties connection option
+- Implementd Windows authentication when used against a 5.5 server
\ No newline at end of file

=== modified file 'MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs'
--- a/MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs	2011-03-31 17:23:01 +0000
+++ b/MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs	2011-03-31 17:29:29 +0000
@@ -896,7 +896,7 @@
             // Integrated Security is a logically bool parameter, SSPI value 
             // for it is the same as "true" (SSPI is SQL Server legacy value
             if (keyword == "Integrated Security" && value is string &&
-                ((string)value).ToLowerInvariant() == "sspi")
+                ((string)value).ToLower(CultureInfo.InvariantCulture) == "sspi")
             {
                 value = true;
             }

=== modified file 'MySql.Data/Provider/Source/NativeDriver.cs'
--- a/MySql.Data/Provider/Source/NativeDriver.cs	2011-03-31 17:23:38 +0000
+++ b/MySql.Data/Provider/Source/NativeDriver.cs	2011-03-31 17:29:29 +0000
@@ -525,7 +525,7 @@
                 }
                 packet.WriteString(AuthenticationWindowsPlugin);
                 stream.SendPacket(packet);
-                AuthenticateSSPI(reset);
+                AuthenticateSSPI();
                 return;
             }
             else


Attachment: [text/bzr-bundle] bzr/[e-mail]