Add files via upload

Author: EdVassie

Build Scripts/FBConfigVar.vbs

@@ -271,27 +271,45 @@ Private Sub HideBuildPassword(strName)
 End Sub
 
 
+Function HidePasswords(strText)
+  ' Hide passwords in Text string
+  Dim strLogText
+
+  strLogText        = strText
+  If Instr(strLogText, "ListPassword:") = 0 Then
+    strLogText      = HidePassword(strLogText, "DefaultPassword /d ")
+    strLogText      = HidePassword(strLogText, "Password")
+    strLogText      = HidePassword(strLogText, "PID")
+    strLogText      = HidePassword(strLogText, "Pwd")
+    strLogText      = HidePassword(strLogText, " -p ")
+  End If
+  HidePasswords     = strLogText
+
+End Function
+
+
 Private Function HidePassword(strText, strKeyword)
   ' Change any passwords to ********
-  Dim intIdx, intFound, intLen
+  Dim intIdx, intFound, intLen, intStart
   Dim strLogText
 
   strLogText        = strText
   intLen            = Len(strLogText)
-  intIdx = Instr(1, strLogText, strKeyword, vbTextCompare)
-  While intIdx > 0
+  intStart          = Instr(1, strLogText, strKeyword, vbTextCompare)
+  While intStart > 0
     intFound        = 0
-    intIdx          = intIdx + Len(strKeyword)
-    While (Instr(""":=' ", Mid(strLogText, intIdx, 1)) > 0 ) And (intIdx < intLen)
+    intStart        = intStart + Len(strKeyword)
+    intIdx          = intStart
+    While (Instr(""":=' ", Mid(strLogText, intIdx, 1)) > 0 ) And (intIdx < intLen) ' Look for start of password value
       intIdx        = intIdx + 1
       intFound      = 1
     Wend
-    While (Instr(""",/' ", Mid(strLogText, intIdx, 1)) = 0) And (IntFound > 0)
+    While (Instr(Chr(13) + """,/ ", Mid(strLogText, intIdx, 1)) = 0) And (IntFound <> 0)
       strLogText    = Left(strLogText, intIdx - 1) & Chr(01) & Mid(strLogText, intIdx + 1)
       intIdx        = intIdx + 1
     Wend
-    intIdx          = Instr(intIdx, strLogText, strKeyword, vbTextCompare)
-  WEnd
+    intStart        = Instr(intStart, strLogText, strKeyword, vbTextCompare)
+  Wend
   While Instr(strLogText, Chr(01) & Chr(01)) > 0
     strLogText      = Replace(Replace(Replace(strLogText, Chr(01) & Chr(01) & Chr(01) & Chr(01), Chr(01)), Chr(01) & Chr(01) & Chr(01), Chr(01)), Chr(01) & Chr(01), Chr(01))
   Wend
@@ -301,23 +319,6 @@ Private Function HidePassword(strText, strKeyword)
 End Function
 
 
-Function HidePasswords(strText)
-  ' Hide passwords in Text string
-  Dim strLogText
-
-  strLogText        = strText
-  If Instr(strLogText, "ListPassword:") = 0 Then
-    strLogText      = HidePassword(strLogText, "DefaultPassword /d ")
-    strLogText      = HidePassword(strLogText, "Password")
-    strLogText      = HidePassword(strLogText, "PID")
-    strLogText      = HidePassword(strLogText, "Pwd")
-    strLogText      = HidePassword(strLogText, " -p ")
-  End If
-  HidePasswords     = strLogText
-
-End Function
-
-
 Sub SetProcessId(strLabel, strDesc)
 ' Save ProcessId details
 

Build Scripts/FBManageLog.vbs

@@ -100,15 +100,14 @@ BEGIN;
     END;
 
     PRINT 'CREATE CERTIFICATE _##PDW_SmDetachSigningCertificate##';
-    DECLARE @certpasswordDCB nvarchar(max);
-    SET @certpasswordDCB = QUOTENAME(N'$(strPBCertPassword)', N'''');
-    EXECUTE(N'CREATE CERTIFICATE _##PDW_SmDetachSigningCertificate## ENCRYPTION BY PASSWORD = ' + @certpasswordDCB + N' WITH  SUBJECT = ''For signing sp_pdw_sm_detach SP'';');
+    DECLARE @certPassword nvarchar(max);
+    SET @certPassword=QUOTENAME(N'$(strPBCertPassword)',N'''');
+    EXECUTE(N'CREATE CERTIFICATE _##PDW_SmDetachSigningCertificate## ENCRYPTION BY PASSWORD = ' + @certPassword + N' WITH  SUBJECT = ''For signing sp_pdw_sm_detach SP'';');
     WAITFOR DELAY '00:00:01';
-    EXECUTE(N'ADD SIGNATURE to [sp_pdw_sm_detach] BY CERTIFICATE _##PDW_SmDetachSigningCertificate## WITH PASSWORD=' + @certpasswordDCB + N';');
+    EXECUTE(N'ADD SIGNATURE to [sp_pdw_sm_detach] BY CERTIFICATE _##PDW_SmDetachSigningCertificate## WITH PASSWORD=' + @certPassword + N';');
     ALTER CERTIFICATE _##PDW_SmDetachSigningCertificate## REMOVE PRIVATE KEY;
 END;
 GO
-
 DECLARE @certBinaryBytes varbinary(max);
 SET @certBinaryBytes = CERTENCODED(cert_id('_##PDW_SmDetachSigningCertificate##')); 
 DECLARE @cmd nvarchar(max)
@@ -163,11 +162,11 @@ BEGIN;
     END;
 
     PRINT 'CREATE CERTIFICATE _##PDW_PolyBaseAuthorizeSigningCertificate##';
-    DECLARE @certpasswordDCB nvarchar(max);
-    SET @certpasswordDCB = QUOTENAME(N'$(strPBCertPassword)', N'''');
-    EXECUTE(N'CREATE CERTIFICATE _##PDW_PolyBaseAuthorizeSigningCertificate## ENCRYPTION BY PASSWORD = ' + @certpasswordDCB + N' WITH  SUBJECT = ''For signing sp_pdw_polybase_authorize SP'';');
+    DECLARE @certPassword nvarchar(max);
+    SET @certPassword=QUOTENAME(N'$(strPBCertPassword)',N'''');
+    EXECUTE(N'CREATE CERTIFICATE _##PDW_PolyBaseAuthorizeSigningCertificate## ENCRYPTION BY PASSWORD = ' + @certPassword + N' WITH  SUBJECT = ''For signing sp_pdw_polybase_authorize SP'';');
     WAITFOR DELAY '00:00:01';
-    EXECUTE(N'ADD SIGNATURE to [sp_pdw_polybase_authorize] BY CERTIFICATE _##PDW_PolyBaseAuthorizeSigningCertificate## WITH PASSWORD=' + @certpasswordDCB + N';');
+    EXECUTE(N'ADD SIGNATURE to [sp_pdw_polybase_authorize] BY CERTIFICATE _##PDW_PolyBaseAuthorizeSigningCertificate## WITH PASSWORD=' + @certPassword + N';');
     ALTER CERTIFICATE _##PDW_PolyBaseAuthorizeSigningCertificate## REMOVE PRIVATE KEY;
 END;
 GO