net.adns: Add some debug logging to help track down traceback

[prosody.git] / prosodyctl

diff --git a/prosodyctl b/prosodyctl
index 81a1bd16f7f6f673d59f9becdc7a02be9df70246..358ec9eaacda242120512d5ad3471fefa5e76c8c 100755 (executable)
--- a/prosodyctl
+++ b/prosodyctl
@@ -66,19 +66,28 @@ require "util.datamanager".set_data_path(data_path);
 
 -- Switch away from root and into the prosody user --
 local switched_user, current_uid;
+
+local want_pposix_version = "0.3.1";
 local ok, pposix = pcall(require, "util.pposix");
+
 if ok and pposix then
+       if pposix._VERSION ~= want_pposix_version then print(string.format("Unknown version (%s) of binary pposix module, expected %s", tostring(pposix._VERSION), want_pposix_version)); return; end
        current_uid = pposix.getuid();
        if current_uid == 0 then
                -- We haz root!
                local desired_user = config.get("*", "core", "prosody_user") or "prosody";
-               local ok, err = pposix.setuid(desired_user);
+               local desired_group = config.get("*", "core", "prosody_group") or desired_user;
+               local ok, err = pposix.setgid(desired_group);
                if ok then
-                       -- Yay!
-                       switched_user = true;
-               else
+                       ok, err = pposix.setuid(desired_user);
+                       if ok then
+                               -- Yay!
+                               switched_user = true;
+                       end
+               end
+               if not switched_user then
                        -- Boo!
-                       print("Warning: Couldn't switch to Prosody user '"..tostring(desired_user).."': "..tostring(err));
+                       print("Warning: Couldn't switch to Prosody user/group '"..tostring(desired_user).."'/'"..tostring(desired_group).."': "..tostring(err));
                end
        end
 else