Enhanced Account Missing Warning In /MoveDomain & /CopyDomain

- Warnings in /MoveDomain and /CopyDomain will now indicate the part of the descriptor being processed as well as the target domain.
NoMoreFood · Dec 19, 2018 · b5a7923 · b5a7923
1 parent 36d72ab
commit b5a7923
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/InputOutput.h b/InputOutput.h
@@ -90,14 +90,14 @@ class InputOutput
 		}
 	}
 
-	static void AddWarning(const std::wstring & sLine)
+	static void AddWarning(const std::wstring & sLine, const std::wstring & sPart = L"")
 	{
 		if (Log())
 		{
-			OperationLog::LogFileItem(L"WARNING", GetFileName(), sLine);
+			OperationLog::LogFileItem(L"WARNING", GetFileName(), sLine + ((sPart.empty()) ? L"" : L" in " + sPart));
 		}
 
-		GetDetail() += L"  WARNING: " + sLine + L"\n";
+		GetDetail() += L"  WARNING: " + sLine + ((sPart.empty()) ? L"" : L" in " + sPart) + L"\n";
 	}
 
 	static void AddError(const std::wstring & sLine, const std::wstring & sExtended = L"")

diff --git a/OperationCopyDomain.cpp b/OperationCopyDomain.cpp
@@ -106,8 +106,8 @@ bool OperationCopyDomain::ProcessAclAction(WCHAR * const sSdPart, ObjectEntry &
 				// continue if no match was found
 				if (tTargetAccountSid == nullptr)
 				{
-					InputOutput::AddWarning(L"Could not find matching account in target domain for '" +
-						sSourceAccountName + L"'");
+					InputOutput::AddWarning(L"Could not find matching account in target domain '" + 
+						sTargetDomain + L"' for '" + sSourceAccountName + L"'", sSdPart);
 					continue;
 				}
 

diff --git a/OperationMoveDomain.cpp b/OperationMoveDomain.cpp
@@ -96,8 +96,8 @@ SidActionResult OperationMoveDomain::DetermineSid(WCHAR * const sSdPart, ObjectE
 		// exit if no match was found
 		if (tResultantSid == nullptr)
 		{
-			InputOutput::AddWarning(L"Could not find matching account in target domain for '" +
-				sSourceAccountName + L"'");
+			InputOutput::AddWarning(L"Could not find matching account in target domain '" +
+				sTargetDomain + L"' for '" + sSourceAccountName + L"'", sSdPart);
 			return SidActionResult::Nothing;
 		}
 

diff --git a/Version.h b/Version.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#define VERSION_STRING "1.10.0.1"
-#define VERSION_COMMA 1,10,0,1
+#define VERSION_STRING "1.10.0.2"
+#define VERSION_COMMA 1,10,0,2