mod_saslauth: Don't print raw SASL data to avoid logging passwords unnecessarily

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 593a0e344b2246718dde0531e145a13193083e6e..55198c2fd5efb0b2447d84f70d5f0f7784b87feb 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -195,7 +195,7 @@ function init_global_state()
                                if type(port) ~= "number" then
                                        log("error", "Non-numeric "..option.."_ports: "..tostring(port));
                                else
-                                       cl.start(listener, { 
+                                       local ok, err = cl.start(listener, {
                                                ssl = conntype ~= "tcp" and global_ssl_ctx,
                                                port = port,
                                                interface = config.get("*", "core", option.."_interface") 
@@ -203,6 +203,33 @@ function init_global_state()
                                                        or config.get("*", "core", "interface"),
                                                type = conntype
                                        });
+                                       if not ok then
+                                               local friendly_message = err;
+                                               if err:match(" in use") then
+                                                       if port == 5222 or port == 5223 or port == 5269 then
+                                                               friendly_message = "check that Prosody or another XMPP server is "
+                                                                       .."not already running and using this port";
+                                                       elseif port == 80 or port == 81 then
+                                                               friendly_message = "check that a HTTP server is not already using "
+                                                                       .."this port";
+                                                       elseif port == 5280 then
+                                                               friendly_message = "check that Prosody or a BOSH connection manager "
+                                                                       .."is not already running";
+                                                       else
+                                                               friendly_message = "this port is in use by another application";
+                                                       end
+                                               elseif err:match("permission") then
+                                                       friendly_message = "Prosody does not have sufficient privileges to use this port";
+                                               elseif err == "no ssl context" then
+                                                       if not config.get("*", "core", "ssl") then
+                                                               friendly_message = "there is no 'ssl' config under Host \"*\" which is "
+                                                                       .."require for legacy SSL ports";
+                                                       else
+                                                               friendly_message = "initializing SSL support failed, see previous log entries";
+                                                       end
+                                               end
+                                               log("error", "Failed to open server port %d, %s", port, friendly_message);
+                                       end
                                end
                        end
                end
@@ -277,7 +304,7 @@ function prepare_to_start()
        -- start listening on sockets
        prosody.net_activate_ports("c2s", "xmppclient", {5222});
        prosody.net_activate_ports("s2s", "xmppserver", {5269});
-       prosody.net_activate_ports("component", "xmppcomponent", {}, "tcp");
+       prosody.net_activate_ports("component", "xmppcomponent", {5347}, "tcp");
        prosody.net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl");
 
        prosody.start_time = os.time();