From 36b0aeeeaa776b439a8db429f5ccb328825099c8 Mon Sep 17 00:00:00 2001
From: Meatballs <eat_meatballs@hotmail.co.uk>
Date: Sat, 20 Apr 2013 12:21:48 +0100
Subject: [PATCH] Tidy output

---
 c/meterpreter/source/extensions/mimikatz/main.h             | 2 +-
 .../extensions/mimikatz/modules/mod_mimikatz_sekurlsa.cpp   | 6 +++---
 .../source/extensions/mimikatz/modules/mod_text.cpp         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/c/meterpreter/source/extensions/mimikatz/main.h b/c/meterpreter/source/extensions/mimikatz/main.h
index b94e403a..c73fa403 100644
--- a/c/meterpreter/source/extensions/mimikatz/main.h
+++ b/c/meterpreter/source/extensions/mimikatz/main.h
@@ -19,4 +19,4 @@ extern "C"
 	MAKE_CUSTOM_TLV(                 \
 	TLV_META_TYPE_STRING,      \
 	TLV_TYPE_EXTENSION_MIMIKATZ, \
-	1)
\ No newline at end of file
+	TLV_EXTENSIONS + 1)
\ No newline at end of file
diff --git a/c/meterpreter/source/extensions/mimikatz/modules/mod_mimikatz_sekurlsa.cpp b/c/meterpreter/source/extensions/mimikatz/modules/mod_mimikatz_sekurlsa.cpp
index 476eb1f0..187ad0b3 100644
--- a/c/meterpreter/source/extensions/mimikatz/modules/mod_mimikatz_sekurlsa.cpp
+++ b/c/meterpreter/source/extensions/mimikatz/modules/mod_mimikatz_sekurlsa.cpp
@@ -242,9 +242,9 @@ bool mod_mimikatz_sekurlsa::getLogonData(vector<wstring> * mesArguments, vector<
 			{
 				if(sessionData->LogonType != Network)
 				{
-					(*outputStream) <<
-						sessions[i].HighPart << L";" << sessions[i].LowPart << L"," <<
-						mod_text::stringOfSTRING(sessionData->AuthenticationPackage) << L",\"" <<
+					(*outputStream) << "\"" <<
+						sessions[i].HighPart << L";" << sessions[i].LowPart << L"\",\"" <<
+						mod_text::stringOfSTRING(sessionData->AuthenticationPackage) << L"\",\"" <<
 						mod_text::stringOfSTRING(sessionData->UserName) << L"\",\"" <<
 						mod_text::stringOfSTRING(sessionData->LogonDomain) << L"\",\"";
 
diff --git a/c/meterpreter/source/extensions/mimikatz/modules/mod_text.cpp b/c/meterpreter/source/extensions/mimikatz/modules/mod_text.cpp
index 7a023264..9b9187cf 100644
--- a/c/meterpreter/source/extensions/mimikatz/modules/mod_text.cpp
+++ b/c/meterpreter/source/extensions/mimikatz/modules/mod_text.cpp
@@ -37,7 +37,7 @@ wstring mod_text::stringOrHex(const BYTE monTab[], DWORD maTaille, DWORD longueu
 		else
 		{
 			if(ligne)
-				result.assign(L"\n");
+				//result.assign(L"\n");
 			result.append(stringOfHex(monTab, maTaille, longueur));
 		}
 	}