prosody
4e6710b4f873
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 8440:4e6710b4f873

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 01 Dec 2017 04:54:23 +0100
parent 8285:433b2a41351f
parent 8419:57610304e30d
child 8561:7b9ffddc4276
comparison
equal deleted inserted replaced
8439:293dbb08427b 8440:4e6710b4f873
943 return 1; -- TODO Should we create it? 943 return 1; -- TODO Should we create it?
944 end 944 end
945 if pposix.getuid() ~= cert_dir_attrs.uid then 945 if pposix.getuid() ~= cert_dir_attrs.uid then
946 show_warning("The directory "..cert_basedir.." is not owned by the current user, won't be able to write files to it"); 946 show_warning("The directory "..cert_basedir.." is not owned by the current user, won't be able to write files to it");
947 return 1; 947 return 1;
948 elseif not cert_dir_attrs.permissions then -- COMPAT with LuaFilesystem < 1.6.2 (hey CentOS!)
949 show_message("Unable to check permissions on "..cert_basedir.." (LuaFilesystem 1.6.2+ required)");
950 show_message("Please confirm that Prosody (and only Prosody) can write to this directory)");
948 elseif cert_dir_attrs.permissions:match("^%.w..%-..%-.$") then 951 elseif cert_dir_attrs.permissions:match("^%.w..%-..%-.$") then
949 show_warning("The directory "..cert_basedir.." not only writable by its owner"); 952 show_warning("The directory "..cert_basedir.." not only writable by its owner");
950 return 1; 953 return 1;
951 end 954 end
952 local subcmd = table.remove(arg, 1); 955 local subcmd = table.remove(arg, 1);