Software / code / prosody
Changeset
13520:662dfff658a0
Merge 0.12->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 30 Aug 2024 18:16:01 +0200 |
| parents | 13517:4bf889e94831 (current diff) 13519:0b6af170617b (diff) |
| children | 13521:7fcae9da8934 |
| files | plugins/mod_invites.lua util/prosodyctl/cert.lua |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_invites.lua Mon Aug 26 22:26:59 2024 +0200 +++ b/plugins/mod_invites.lua Fri Aug 30 18:16:01 2024 +0200 @@ -193,7 +193,7 @@ 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
--- a/util/prosodyctl/cert.lua Mon Aug 26 22:26:59 2024 +0200 +++ b/util/prosodyctl/cert.lua Fri Aug 30 18:16:01 2024 +0200 @@ -163,7 +163,7 @@ 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));
