Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145).

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/database/rrdfunctions-inline.c b/src/database/rrdfunctions-inline.c
index 3eb30e7b5..a8e2c2357 100644
--- a/src/database/rrdfunctions-inline.c
+++ b/src/database/rrdfunctions-inline.c
@@ -17,7 +17,7 @@ static int rrd_function_run_inline(struct rrd_function_execute *rfe, void *data)
     if(rfe->is_cancelled.cb && rfe->is_cancelled.cb(rfe->is_cancelled.data))
         code = HTTP_RESP_CLIENT_CLOSED_REQUEST;
     else
-        code = fi->cb(rfe->result.wb, rfe->function);
+        code = fi->cb(rfe->result.wb, rfe->function, rfe->payload, rfe->source);
 
     if(code == HTTP_RESP_CLIENT_CLOSED_REQUEST || (rfe->is_cancelled.cb && rfe->is_cancelled.cb(rfe->is_cancelled.data))) {
         buffer_flush(rfe->result.wb);
@@ -30,7 +30,7 @@ static int rrd_function_run_inline(struct rrd_function_execute *rfe, void *data)
     return code;
 }
 
-void rrd_function_add_inline(RRDHOST *host, RRDSET *st, const char *name, int timeout, int priority,
+void rrd_function_add_inline(RRDHOST *host, RRDSET *st, const char *name, int timeout, int priority, uint32_t version,
                              const char *help, const char *tags,
                              HTTP_ACCESS access, rrd_function_execute_inline_cb_t execute_cb) {
 
@@ -39,6 +39,7 @@ void rrd_function_add_inline(RRDHOST *host, RRDSET *st, const char *name, int ti
     struct rrd_function_inline *fi = callocz(1, sizeof(struct rrd_function_inline));
     fi->cb = execute_cb;
 
-    rrd_function_add(host, st, name, timeout, priority, help, tags, access, true,
+    rrd_function_add(host, st, name, timeout, priority, version,
+                     help, tags, access, true,
                      rrd_function_run_inline, fi);
 }