projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved output generation for xport out of rrd_tool.c -- martin sperl
[rrdtool.git]
/
src
/
rrd_daemon.c
diff --git
a/src/rrd_daemon.c
b/src/rrd_daemon.c
index
2eb6930
..
340ea15
100644
(file)
--- a/
src/rrd_daemon.c
+++ b/
src/rrd_daemon.c
@@
-63,13
+63,6
@@
* Now for some includes..
*/
/* {{{ */
* Now for some includes..
*/
/* {{{ */
-#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
-#include "../win32/config.h"
-#else
-#ifdef HAVE_CONFIG_H
-#include "../rrd_config.h"
-#endif
-#endif
#include "rrd_tool.h"
#include "rrd_client.h"
#include "rrd_tool.h"
#include "rrd_client.h"
@@
-1331,7
+1324,7
@@
static int handle_request_update (HANDLER_PROTO) /* {{{ */
/* save it for the journal later */
if (!JOURNAL_REPLAY(sock))
/* save it for the journal later */
if (!JOURNAL_REPLAY(sock))
- strncpy(orig_buf, buffer,
buffer_size
);
+ strncpy(orig_buf, buffer,
min(RRD_CMD_MAX,buffer_size)
);
status = buffer_get_field (&buffer, &buffer_size, &file);
if (status != 0)
status = buffer_get_field (&buffer, &buffer_size, &file);
if (status != 0)
@@
-2654,7
+2647,7
@@
static void *connection_thread_main (void *args) /* {{{ */
getting overwritten by another thread.
*/
struct request_info req;
getting overwritten by another thread.
*/
struct request_info req;
- request_init(&req, RQ_DAEMON, "rrdcache\0", RQ_FILE, fd, NULL );
+ request_init(&req, RQ_DAEMON, "rrdcache
d
\0", RQ_FILE, fd, NULL );
fromhost(&req);
if(!hosts_access(&req)) {
RRDD_LOG(LOG_INFO, "refused connection from %s", eval_client(&req));
fromhost(&req);
if(!hosts_access(&req)) {
RRDD_LOG(LOG_INFO, "refused connection from %s", eval_client(&req));