# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1286156262 -3600
# Node ID 1ccc729780b7a5d42bf983cf64da1cf5eabd4c9f
# Parent  65f1e0f9338f9cf11cacee45e1c3491915358837
servers/jabberd14.lua: Detect 1.4.x/1.6.x/jadc2s

diff -r 65f1e0f9338f -r 1ccc729780b7 servers/jabberd14.lua
--- a/servers/jabberd14.lua	Mon Oct 04 02:37:10 2010 +0100
+++ b/servers/jabberd14.lua	Mon Oct 04 02:37:42 2010 +0100
@@ -1,19 +1,15 @@
--- The jabberd14/jabberd2 split is a complete mess. There are
--- servers that report as jabberd14 that return the same fingerprint
--- as jabberd2 servers. A jabberd14 1.6.1.1 server on Debian was
--- more similar to jabberd14 1.4.x, so I am assuming it to be the
--- correct one, even though I can't find another one like it...
-
 function testers.jabberd14()
-	if test(q_invalid_xml, literal ">Invalid XML<") then
+	if test(q_invalid_xml, literal ">Invalid XML<")
+	or (test(q_invalid_xml, literal ">syntax error</text>")
+	    and not test(q_invalid_host, literal " id='")) then
 		server_name = "jabberd14";
 		
-		if test(q_invalid_xml, "^<%?xml")
-		and test(q_empty_message_tag, literal ">Did not specify a valid to argument<") then
-			server_min_version = "1.6.0";
-			server_comment "Likely Debian's package, other 1.6.x jabberd's report as jabberd2";
-		elseif test(q_invalid_xml, "^<stream:error>") then
-			server_max_version = "1.4.x";
+		if test(q_invalid_xml, "^<stream:error>") then
+			server_min_version = "1.4.x";
+		elseif test(q_empty_message_tag, literal "<improper-addressing ") then
+			server_min_version = "1.6.0"
+		elseif test(q_empty_message_tag, literal "<bad-format ") then
+			server_comment "Using jadc2s connection manager, jabberd14 version unknown";
 		end
 	end
 end