Merge 0.10->trunk

diff --git a/net/server_select.lua b/net/server_select.lua
index ced73074d56f981357eb6b3513df3949825b8942..4df6e12d750ce2ce15ef6a719e4308792a5ac2f8 100644 (file)
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -580,8 +580,9 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
                                                coroutine_yield( ) -- handshake not finished
                                        end
                                end
-                               out_put( "server.lua: ssl handshake error: ", tostring(err or "handshake too long") )
-                               _ = handler and handler:force_close("ssl handshake failed")
+                               err = "ssl handshake error: " .. ( err or "handshake too long" );
+                               out_put( "server.lua: ", err );
+                               _ = handler and handler:force_close(err)
                                return false, err -- handshake failed
                        end
                )

diff --git a/plugins/mod_admin_adhoc.lua b/plugins/mod_admin_adhoc.lua
index fdbdf46290a4c764c9c145babe1856e99ee5de6c..392e715e3b8954fd80a22e119811ae9ec56a29a7 100644 (file)
--- a/plugins/mod_admin_adhoc.lua
+++ b/plugins/mod_admin_adhoc.lua
@@ -390,7 +390,7 @@ local function session_flags(session, line)
                flags[#flags+1] = "encrypted";
        end
        if session.compressed then
-               flags[#flags+1] = "compressed)";
+               flags[#flags+1] = "compressed";
        end
        if session.smacks then
                flags[#flags+1] = "sm";
@@ -422,7 +422,7 @@ local function list_s2s_this_handler(self, data, state)
                local sess_lines = { r = remotehost,
                        session_flags(session, { "", direction, remotehost or "?" })};
 
-               if remotehost:match(module_host) or localhost:match(module_host) then
+               if localhost == module_host then
                        s2s_list[#s2s_list+1] = sess_lines;
                end
        end