Skip to content

Commit eef2d4f

Browse files
committed
Position of fields (for Firebird 1.5 (DNET-719)).
1 parent ce6cf54 commit eef2d4f

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/GdsConnection.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,20 @@ private byte[] UserIdentificationData()
287287
{
288288
using (var result = new MemoryStream())
289289
{
290+
var userString = Environment.GetEnvironmentVariable("USERNAME") ?? Environment.GetEnvironmentVariable("USER") ?? string.Empty;
291+
var user = Encoding.UTF8.GetBytes(userString);
292+
result.WriteByte(IscCodes.CNCT_user);
293+
result.WriteByte((byte)user.Length);
294+
result.Write(user, 0, user.Length);
295+
296+
var host = Encoding.UTF8.GetBytes(Dns.GetHostName());
297+
result.WriteByte(IscCodes.CNCT_host);
298+
result.WriteByte((byte)host.Length);
299+
result.Write(host, 0, host.Length);
300+
301+
result.WriteByte(IscCodes.CNCT_user_verification);
302+
result.WriteByte(0);
303+
290304
if (!string.IsNullOrEmpty(_userID))
291305
{
292306
_srp = new SrpClient();
@@ -323,24 +337,10 @@ private byte[] UserIdentificationData()
323337
WriteMultiPartHelper(result, IscCodes.CNCT_specific_data, specificData);
324338
}
325339

326-
var userString = Environment.GetEnvironmentVariable("USERNAME") ?? Environment.GetEnvironmentVariable("USER") ?? string.Empty;
327-
var user = Encoding.UTF8.GetBytes(userString);
328-
result.WriteByte(IscCodes.CNCT_user);
329-
result.WriteByte((byte)user.Length);
330-
result.Write(user, 0, user.Length);
331-
332-
var host = Encoding.UTF8.GetBytes(Dns.GetHostName());
333-
result.WriteByte(IscCodes.CNCT_host);
334-
result.WriteByte((byte)host.Length);
335-
result.Write(host, 0, host.Length);
336-
337340
result.WriteByte(IscCodes.CNCT_client_crypt);
338341
result.WriteByte(4);
339342
result.Write(new byte[] { 0, 0, 0, 0 }, 0, 4);
340343

341-
result.WriteByte(IscCodes.CNCT_user_verification);
342-
result.WriteByte(0);
343-
344344
return result.ToArray();
345345
}
346346
}

0 commit comments

Comments
 (0)