Merge branch 'rsmudge-armitage'

Author: sinn3r

data/armitage/armitage.jar

@@ -8,6 +8,11 @@ Armitage Changelog
   creating additional connections to server to balance messages over
 - Preferences are now shared among each Armitage connection.
 
+6 Mar 13 (2000h)
+--------
+- Fixed issue with additional team server connections reporting wrong
+  application and receiving a summary rejection by the team server.
+
 Cortana Updates (for scripters)
 --------
 - Added a &publish, &query, &subscribe API to allow inter-script 

data/armitage/cortana.jar

@@ -187,7 +187,7 @@ sub _connectToMetasploit {
 				local('$x $cc');
 				for ($x = 0; $x < 6; $x++) {
 					$cc = c_client($1, $2);
-					call($cc, "armitage.validate", $3, $4, $null, "cobaltstrike", 120326);
+					call($cc, "armitage.validate", $3, $4, $null, "armitage", 120326);
 					push(@POOL, $cc);
 				}
 			}

data/armitage/whatsnew.txt

@@ -68,7 +68,10 @@ sub loadPreferences {
 		else {
 			[$prefs load: resource("resources/armitage.prop")];
 		}
-		[$__frame__ setPreferences: $prefs];
+
+		if ($__frame__ !is $null) {
+			[$__frame__ setPreferences: $prefs];
+		}
 	}
 
 	# parse command line options here.

external/source/armitage/scripts/armitage.sl

@@ -8,6 +8,11 @@ Armitage Changelog
   creating additional connections to server to balance messages over
 - Preferences are now shared among each Armitage connection.
 
+6 Mar 13 (2000h)
+--------
+- Fixed issue with additional team server connections reporting wrong
+  application and receiving a summary rejection by the team server.
+
 Cortana Updates (for scripters)
 --------
 - Added a &publish, &query, &subscribe API to allow inter-script