fix merge issue

twsouthwick · twsouthwick · commit e894bb19737c · 2025-07-15T11:38:03.000-07:00
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NegotiateSspiContextProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NegotiateSspiContextProvider.cs
@@ -20,7 +20,7 @@ protected override bool GenerateContext(ReadOnlySpan<byte> incomingBlob, IBuffer
 
             // Log session id, status code and the actual SPN used in the negotiation
             SqlClientEventSource.Log.TryTraceEvent("{0}.{1} | Info | Session Id {2}, StatusCode={3}, SPN={4}", nameof(NegotiateSspiContextProvider),
-                nameof(GenerateSspiClientContext), _physicalStateObj.SessionId, statusCode, negotiateAuth.TargetName);
+                nameof(GenerateContext), _physicalStateObj.SessionId, statusCode, negotiateAuth.TargetName);
 
             if (statusCode == NegotiateAuthenticationStatusCode.Completed || statusCode == NegotiateAuthenticationStatusCode.ContinueNeeded)
             {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ protected override bool GenerateContext(ReadOnlySpan<byte> incomingBlob, IBuffer`
`20`	`20`
`21`	`21`	`// Log session id, status code and the actual SPN used in the negotiation`
`22`	`22`	`SqlClientEventSource.Log.TryTraceEvent("{0}.{1} \| Info \| Session Id {2}, StatusCode={3}, SPN={4}", nameof(NegotiateSspiContextProvider),`
`23`		`- nameof(GenerateSspiClientContext), _physicalStateObj.SessionId, statusCode, negotiateAuth.TargetName);`
	`23`	`+ nameof(GenerateContext), _physicalStateObj.SessionId, statusCode, negotiateAuth.TargetName);`
`24`	`24`
`25`	`25`	`if (statusCode == NegotiateAuthenticationStatusCode.Completed \|\| statusCode == NegotiateAuthenticationStatusCode.ContinueNeeded)`
`26`	`26`	`{`