Armitage 03.06.13

Apparently, my last update came from the future. This modification
to that future update fixes an oversight preventing Armitage from
connecting to its collaboration server because it would report the
wrong application.

data/armitage/whatsnew.txt

@@ -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 

external/source/armitage/scripts/armitage.sl

@@ -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);
 				}
 			}

external/source/armitage/scripts/preferences.sl

@@ -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/whatsnew.txt

@@ -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