merged updated win32 port by Larry Adams and the cacti team

[rrdtool-all.git] / program / src / rrd_daemon.c

diff --git a/program/src/rrd_daemon.c b/program/src/rrd_daemon.c
index 9ecd39fb1d694498282627b4380b8c70b9e75b28..495a313d28e4cfd240bd5408c4c7cbf8293e5100 100644 (file)
--- a/program/src/rrd_daemon.c
+++ b/program/src/rrd_daemon.c
@@ -63,7 +63,7 @@
  * Now for some includes..
  */
 /* {{{ */
-#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
 #include "../win32/config.h"
 #else
 #ifdef HAVE_CONFIG_H
@@ -1331,7 +1331,7 @@ static int handle_request_update (HANDLER_PROTO) /* {{{ */
 
   /* 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)