#3356 Reworked the flow so no extra temp table is needed

Author: Montro1981

sp_Blitz.sql

@@ -225,6 +225,16 @@ AS
             /* End of declarations for First Responder Kit consistency check:*/
         ;
 
+		/* Create temp table for check 2301 */
+		IF OBJECT_ID('tempdb..#InvalidLogins') IS NOT NULL
+			EXEC sp_executesql N'DROP TABLE #InvalidLogins;';
+								 
+		CREATE TABLE #InvalidLogins
+		(
+			LoginSID    varbinary(85),
+			LoginName   VARCHAR(256)
+		);
+
 		/*Starting permissions checks here, but only if we're not a sysadmin*/
 		IF
         (
@@ -299,20 +309,12 @@ AS
 
 			IF ISNULL(@SkipValidateLogins, 0) != 1 /*If @SkipValidateLogins hasn't been set to 1 by the caller*/
 			BEGIN
-			    IF OBJECT_ID(N'tempdb..#ValidateLoginsTest') IS NOT NULL
-			    	EXEC sp_executesql N'DROP TABLE #ValidateLoginsTest;';
-				
-			    CREATE TABLE #ValidateLoginsTest
-			    (
-			    	[SID] varbinary(85)
-			    	,[NT_Login] sysname
-			    );
-			
 			    BEGIN TRY
-			        INSERT INTO #ValidateLoginsTest
+			        /* Try to fill the table for check 2301 */
+					INSERT INTO #InvalidLogins
 			    	(
-			    		[SID]
-			    		,[NT_Login]
+			    		[LoginSID]
+			    		,[LoginName]
 			    	)
 			    	EXEC sp_validatelogins;
 
@@ -321,9 +323,6 @@ AS
 			    BEGIN CATCH
 			    	SET @SkipValidateLogins = 1; /*We have don't have execute rights or sp_validatelogins throws an error so skip it*/
 			    END CATCH;
-			
-			    IF OBJECT_ID(N'tempdb..#ValidateLoginsTest') IS NOT NULL
-			    	EXEC sp_executesql N'DROP TABLE #ValidateLoginsTest;';
 			END; /*Need execute on sp_validatelogins*/
 
 			IF ISNULL(@SkipModel, 0) != 1 /*If @SkipModel hasn't been set to 1 by the caller*/
@@ -562,16 +561,6 @@ AS
 		FROM (VALUES(NULL, 2301, NULL))	AS v (DatabaseName, CheckID, ServerName) /*sp_validatelogins*/
 		WHERE @SkipValidateLogins = 1
 
-        IF(OBJECT_ID('tempdb..#InvalidLogins') IS NOT NULL)
-        BEGIN
-            EXEC sp_executesql N'DROP TABLE #InvalidLogins;';
-        END;
-								 
-		CREATE TABLE #InvalidLogins (
-			LoginSID    varbinary(85),
-			LoginName   VARCHAR(256)
-		);
-
 		IF @SkipChecksTable IS NOT NULL
 			AND @SkipChecksSchema IS NOT NULL
 			AND @SkipChecksDatabase IS NOT NULL
@@ -1704,9 +1693,9 @@ AS
 
 						IF @Debug IN (1, 2) RAISERROR('Running CheckId [%d].', 0, 1, 2301) WITH NOWAIT;
 
-                        INSERT INTO #InvalidLogins
-                        EXEC sp_validatelogins 
-                        ;
+                        /*
+						#InvalidLogins is filled at the start during the permissions check
+						*/
 
 						INSERT  INTO #BlitzResults
 								( CheckID ,