Software / code / prosody
Comparison
prosodyctl @ 8015:ecb110f45c92
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 28 Mar 2017 20:14:35 +0200 |
| parent | 7923:81f3068fc30c |
| parent | 8012:e898c8fda986 |
| child | 8068:5abb6bc45edd |
comparison
equal
deleted
inserted
replaced
| 8009:1c311d8c1443 | 8015:ecb110f45c92 |
|---|---|
| 133 dependencies.log_warnings(); | 133 dependencies.log_warnings(); |
| 134 | 134 |
| 135 -- Switch away from root and into the prosody user -- | 135 -- Switch away from root and into the prosody user -- |
| 136 local switched_user, current_uid; | 136 local switched_user, current_uid; |
| 137 | 137 |
| 138 local want_pposix_version = "0.3.6"; | 138 local want_pposix_version = "0.4.0"; |
| 139 local ok, pposix = pcall(require, "util.pposix"); | 139 local ok, pposix = pcall(require, "util.pposix"); |
| 140 | 140 |
| 141 if ok and pposix then | 141 if ok and pposix then |
| 142 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 | 142 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 |
| 143 current_uid = pposix.getuid(); | 143 current_uid = pposix.getuid(); |