diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-cfengine-3.4.0/src/files_select.c ./src/files_select.c
--- ../orig-cfengine-3.4.0/src/files_select.c	2012-11-26 12:13:20.000000000 +0100
+++ ./src/files_select.c	2012-11-29 09:15:53.859129139 +0100
@@ -285,7 +285,7 @@
 
 #ifndef MINGW                   // no uids on Windows
     char buffer[CF_SMALLBUF];
-    snprintf(buffer, CF_BUFSIZE, "%jd", (uintmax_t) lstatptr->st_uid);
+    snprintf(buffer, CF_SMALLBUF, "%jd", (uintmax_t) lstatptr->st_uid);
     PrependAlphaList(&leafattrib, buffer);
 #endif /* MINGW */
 
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-cfengine-3.4.0/src/server.c ./src/server.c
--- ../orig-cfengine-3.4.0/src/server.c	2012-11-26 12:13:20.000000000 +0100
+++ ./src/server.c	2012-11-29 08:49:31.871817185 +0100
@@ -2367,7 +2367,7 @@
 
     if (strlen(ReadLastNode(filename)) > CF_MAXLINKSIZE)
     {
-        snprintf(sendbuffer, CF_BUFSIZE * 2, "BAD: Filename suspiciously long [%s]\n", filename);
+        snprintf(sendbuffer, CF_BUFSIZE, "BAD: Filename suspiciously long [%s]\n", filename);
         CfOut(cf_error, "", "%s", sendbuffer);
         SendTransaction(conn->sd_reply, sendbuffer, 0, CF_DONE);
         return -1;