util.cyrus_sasl: Pass the realm to Cyrus

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 2f60181efec995abc488c9c64ec4a5d8dbb7cca1..b13369a94cdeafb5994fb9ee357f2d92fcac6944 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -232,8 +232,12 @@ function init_global_state()
                                                elseif err:match("permission") then
                                                        friendly_message = "Prosody does not have sufficient privileges to use this port";
                                                elseif err == "no ssl context" then
-                                                       friendly_message = "there is no 'ssl' config under Host \"*\" which is "
-                                                               .."require for legacy SSL ports";
+                                                       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
@@ -304,7 +308,7 @@ function init_data_store()
 end
 
 function prepare_to_start()
-       log("debug", "Prosody is using the %s backend for connection handling", server.get_backend());
+       log("info", "Prosody is using the %s backend for connection handling", server.get_backend());
        -- Signal to modules that we are ready to start
        eventmanager.fire_event("server-starting");
        prosody.events.fire_event("server-starting");