mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2016-02-24 11:20:00 +01:00
commit 85fba1e869
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
prosodyctl
View file

@ -233,6 +233,7 @@ local function make_host(hostname)
type = "local", type = "local",
events = prosody.events, events = prosody.events,
modules = {}, modules = {},
sessions = {},
users = require "core.usermanager".new_null_provider(hostname) users = require "core.usermanager".new_null_provider(hostname)
}; };
end end

2
util-src/crand.c
View file

@ -23,7 +23,7 @@
* TODO: Decide on fixed size or dynamically allocated buffer * TODO: Decide on fixed size or dynamically allocated buffer
*/ */
#if 1 #if 1
#include <malloc.h> #include <stdlib.h>
#else #else
#define BUFLEN 256 #define BUFLEN 256
#endif #endif