Nullref?

dotnet · Aug 20, 2020 · 8bc6eab · 8bc6eab
1 parent 02073d4
commit 8bc6eab
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/Security/Authentication/Negotiate/src/NegotiateHandler.cs b/src/Security/Authentication/Negotiate/src/NegotiateHandler.cs
@@ -42,15 +42,6 @@ public class NegotiateHandler : AuthenticationHandler<NegotiateOptions>, IAuthen
         public NegotiateHandler(IOptionsMonitor<NegotiateOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock)
             : base(options, logger, encoder, clock)
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && Options?.LdapConnectionOptions != null)
-            {
-                if (string.IsNullOrEmpty(Options.LdapConnectionOptions.Domain))
-                {
-                    throw new InvalidOperationException($"{nameof(LdapConnectionOptions)} is configured but {nameof(LdapConnectionOptions.Domain)} is not set");
-                }
-
-                _linuxAdapter = new LinuxAdapter(Options, Logger);
-            }
         }
 
         /// <summary>
@@ -341,6 +332,16 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
                 Principal = user
             };
 
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && Options?.LdapConnectionOptions != null && _linuxAdapter == null)
+            {
+                if (string.IsNullOrEmpty(Options.LdapConnectionOptions.Domain))
+                {
+                    throw new InvalidOperationException($"{nameof(LdapConnectionOptions)} is configured but {nameof(LdapConnectionOptions.Domain)} is not set");
+                }
+
+                _linuxAdapter = new LinuxAdapter(Options, Logger);
+            }
+
             if (_linuxAdapter != null)
             {
                 await _linuxAdapter.OnAuthenticatedAsync(authenticatedContext);