diff options
| author | Simon Rettberg | 2017-11-10 12:26:51 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-11-10 12:26:51 +0100 |
| commit | 0597319201fdb3dddb8a38c6cb091bfa45dcca6a (patch) | |
| tree | 84587d9eebc45579b2f6cebf2a6c22131b135bbd /src/server | |
| parent | [SERVER] Check RLIMIT_NOFILE on startup and try to increase if required (diff) | |
| download | dnbd3-0597319201fdb3dddb8a38c6cb091bfa45dcca6a.tar.gz dnbd3-0597319201fdb3dddb8a38c6cb091bfa45dcca6a.tar.xz dnbd3-0597319201fdb3dddb8a38c6cb091bfa45dcca6a.zip | |
[SERVER] jansson < 2.6 compat
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/rpc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/server/rpc.c b/src/server/rpc.c index c739f12..3d3d665 100644 --- a/src/server/rpc.c +++ b/src/server/rpc.c @@ -16,6 +16,10 @@ #include <fcntl.h> #include <unistd.h> +#if JANSSON_VERSION_HEX < 0x020600 +#define json_stringn_nocheck(a,b) json_string_nocheck(a) +#endif + #define ACL_ALL 0x7fffffff #define ACL_STATS 1 #define ACL_CLIENT_LIST 2 @@ -327,6 +331,7 @@ static bool handleStatus(int sock, int permissions, struct field *fields, size_t val = json_null(); } else { val = json_stringn_nocheck( logbuf, (size_t)len ); + } json_object_set_new( statisticsJson, "logfile", val ); } |