diff options
| author | Kim Alvefur <zash@zash.se> | 2024-08-30 18:16:01 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2024-08-30 18:16:01 +0200 |
| commit | 84ca2bd960546e730cac0a7a4d7ca900e510e063 (patch) | |
| tree | d2695760b918173929cd38dc909c904d91d91696 | |
| parent | ad41d2b5d83422e7ad036d64d7edbcd2c6fbee20 (diff) | |
| parent | a719f5897c2a488add6dcd63edc47e32de7e6c73 (diff) | |
| download | prosody-84ca2bd960546e730cac0a7a4d7ca900e510e063.tar.gz prosody-84ca2bd960546e730cac0a7a4d7ca900e510e063.zip | |
Merge 0.12->trunk
| -rw-r--r-- | plugins/mod_invites.lua | 2 | ||||
| -rw-r--r-- | util/prosodyctl/cert.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_invites.lua b/plugins/mod_invites.lua index 559170cc..5ee9430a 100644 --- a/plugins/mod_invites.lua +++ b/plugins/mod_invites.lua @@ -193,7 +193,7 @@ function get(token, username) type = token_info and token_info.type or "roster"; uri = token_info and token_info.uri or get_uri("roster", username.."@"..module.host, token); additional_data = token_info and token_info.additional_data or nil; - reusable = token_info.reusable; + reusable = token_info and token_info.reusable or false; }, valid_invite_mt); end diff --git a/util/prosodyctl/cert.lua b/util/prosodyctl/cert.lua index aea61c20..70c09443 100644 --- a/util/prosodyctl/cert.lua +++ b/util/prosodyctl/cert.lua @@ -163,7 +163,7 @@ local function copy(from, to, umask, owner, group) local attrs = lfs.attributes(to); if attrs then -- Move old file out of the way local backup = to..".bkp~"..os.date("%FT%T", attrs.change); - os.rename(to, backup); + assert(os.rename(to, backup)); end -- FIXME friendlier error handling, maybe move above backup back? local input = assert(io.open(from)); |