Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit73fbd5c

Browse files
committed
Reapply changes after merge conflicts
1 parent69c2fcb commit73fbd5c

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNICommon.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ internal class SNICommon
151151
/// <returns>True if certificate is valid</returns>
152152
internalstaticboolValidateSslServerCertificate(GuidconnectionId,stringtargetServerName,stringhostNameInCertificate,X509CertificateserverCert,stringvalidationCertFileName,SslPolicyErrorspolicyErrors)
153153
{
154-
using(TrySNIEventScope.Create("SNICommon.ValidateSslServerCertificate | SNI | SCOPE | INFO | Entering Scope {0} "))
154+
using(TrySNIEventScope.Create(nameof(SNICommon)))
155155
{
156156
if(policyErrors==SslPolicyErrors.None)
157157
{
@@ -292,7 +292,7 @@ internal static bool ValidateSslServerCertificate(Guid connectionId, string targ
292292

293293
internalstaticIPAddress[]GetDnsIpAddresses(stringserverName,TimeoutTimertimeout)
294294
{
295-
using(TrySNIEventScope.Create(nameof(GetDnsIpAddresses)))
295+
using(TrySNIEventScope.Create(nameof(SNICommon)))
296296
{
297297
intremainingTimeout=timeout.MillisecondsRemainingInt;
298298
SqlClientEventSource.Log.TrySNITraceEvent(nameof(SNICommon),EventType.INFO,
@@ -310,7 +310,7 @@ internal static IPAddress[] GetDnsIpAddresses(string serverName, TimeoutTimer ti
310310

311311
internalstaticIPAddress[]GetDnsIpAddresses(stringserverName)
312312
{
313-
using(TrySNIEventScope.Create(nameof(GetDnsIpAddresses)))
313+
using(TrySNIEventScope.Create(nameof(SNICommon)))
314314
{
315315
SqlClientEventSource.Log.TrySNITraceEvent(nameof(SNICommon),EventType.INFO,"Getting DNS host entries for serverName {0}.",args0:serverName);
316316
returnDns.GetHostAddresses(serverName);

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NegotiateSSPIContextProvider.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ internal override void GenerateSspiClientContext(ReadOnlyMemory<byte> received,
2121
_negotiateAuth??=new(newNegotiateAuthenticationClientOptions{Package="Negotiate",TargetName=Encoding.Unicode.GetString(_sniSpnBuffer[i])});
2222
sendBuff=_negotiateAuth.GetOutgoingBlob(received.Span,outstatusCode)!;
2323
// Log session id, status code and the actual SPN used in the negotiation
24-
SqlClientEventSource.Log.TryTraceEvent("TdsParserStateObjectManaged.GenerateSspiClientContext | Info | Session Id {0}, StatusCode={1}, SPN={2}",_physicalStateObj.SessionId,statusCode,_negotiateAuth.TargetName);
24+
SqlClientEventSource.Log.TryTraceEvent("{0}.{1} | Info | Session Id {2}, StatusCode={3}, SPN={4}",nameof(NegotiateSSPIContextProvider),
25+
nameof(GenerateSspiClientContext),_physicalStateObj.SessionId,statusCode,_negotiateAuth.TargetName);
2526
if(statusCode==NegotiateAuthenticationStatusCode.Completed||statusCode==NegotiateAuthenticationStatusCode.ContinueNeeded)
2627
break;// Successful case, exit the loop with current SPN.
2728
else

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp