import boxbackup_0.11~rc2-1.dsc

9 files changed, 17 insertions, 4 deletions

diff --git a/lib/backupclient/BackupClientFileAttributes.cpp b/lib/backupclient/BackupClientFileAttributes.cpp
index c2ba680f..1aefb4b4 100644
--- a/lib/backupclient/BackupClientFileAttributes.cpp
+++ b/lib/backupclient/BackupClientFileAttributes.cpp
@@ -64,6 +64,8 @@
 #include <sys/xattr.h>
 #endif
 
+#include <cstring>
+
 #include "BackupClientFileAttributes.h"
 #include "CommonException.h"
 #include "FileModificationTime.h"
diff --git a/lib/backupclient/BackupStoreFile.h b/lib/backupclient/BackupStoreFile.h
index 308667c7..5c84df71 100644
--- a/lib/backupclient/BackupStoreFile.h
+++ b/lib/backupclient/BackupStoreFile.h
@@ -54,6 +54,7 @@
 #include "BackupStoreFilename.h"
 
 #include <memory>
+#include <cstdlib>
 
 typedef struct 
 {
diff --git a/lib/backupclient/BackupStoreFileDiff.cpp b/lib/backupclient/BackupStoreFileDiff.cpp
index 95e2bf1d..86747589 100644
--- a/lib/backupclient/BackupStoreFileDiff.cpp
+++ b/lib/backupclient/BackupStoreFileDiff.cpp
@@ -72,6 +72,8 @@
 
 #include "MemLeakFindOn.h"
 
+#include <cstring>
+
 using namespace BackupStoreFileCryptVar;
 using namespace BackupStoreFileCreation;
 
diff --git a/lib/backupclient/BackupStoreFileEncodeStream.cpp b/lib/backupclient/BackupStoreFileEncodeStream.cpp
index f6d68181..87caca6d 100644
--- a/lib/backupclient/BackupStoreFileEncodeStream.cpp
+++ b/lib/backupclient/BackupStoreFileEncodeStream.cpp
@@ -63,6 +63,8 @@
 
 #include "MemLeakFindOn.h"
 
+#include <cstring>
+
 using namespace BackupStoreFileCryptVar;
 
 
diff --git a/lib/common/BoxPortsAndFiles.h b/lib/common/BoxPortsAndFiles.h
index ffd353bf..f982e675 100755
--- a/lib/common/BoxPortsAndFiles.h
+++ b/lib/common/BoxPortsAndFiles.h
@@ -70,9 +70,9 @@
 	#define BOX_GET_DEFAULT_BBSTORED_CONFIG_FILE \
 		GetDefaultConfigFilePath("bbstored.conf").c_str()
 #else
-#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "/etc/boxbackup/bbackupd.conf"
-#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "/etc/boxbackup/raidfile.conf"
-#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "/etc/boxbackup/bbstored.conf"
+#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG	"/etc/boxbackup/bbackupd.conf"
+#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG	"/etc/boxbackup/raidfile.conf"
+#define BOX_FILE_BBSTORED_DEFAULT_CONFIG 	"/etc/boxbackup/bbstored.conf"
 #endif
 
 #endif // BOXPORTSANDFILES__H
diff --git a/lib/common/Configuration.cpp b/lib/common/Configuration.cpp
index 66702d55..ba84ea48 100644
--- a/lib/common/Configuration.cpp
+++ b/lib/common/Configuration.cpp
@@ -58,6 +58,8 @@
 
 #include "MemLeakFindOn.h"
 
+#include <cstring>
+
 // utility whitespace function
 inline bool iw(int c)
 {
diff --git a/lib/common/WaitForEvent.h b/lib/common/WaitForEvent.h
index cb62b8a9..63a33b92 100644
--- a/lib/common/WaitForEvent.h
+++ b/lib/common/WaitForEvent.h
@@ -63,6 +63,8 @@
 
 #include "MemLeakFindOn.h"
 
+#include <cstdlib>
+
 class WaitForEvent
 {
 public:
diff --git a/lib/raidfile/RaidFileRead.cpp b/lib/raidfile/RaidFileRead.cpp
index 3e969188..8e6dd46b 100644
--- a/lib/raidfile/RaidFileRead.cpp
+++ b/lib/raidfile/RaidFileRead.cpp
@@ -76,6 +76,8 @@
 
 #include "MemLeakFindOn.h"
 
+#include <cstdlib>
+
 #define READ_NUMBER_DISCS_REQUIRED	3
 #define READV_MAX_BLOCKS		64
 
diff --git a/lib/raidfile/raidfile-config.in b/lib/raidfile/raidfile-config.in
index 76b65ace..b8ea73a5 100755
--- a/lib/raidfile/raidfile-config.in
+++ b/lib/raidfile/raidfile-config.in
@@ -19,7 +19,7 @@ Usage:
     raidfile-config config-dir block-size dir0 [dir1 dir2]
 
 Parameters:
-    config-dir        is usually @sysconfdir_expanded@/box
+    config-dir        is usually @sysconfdir_expanded@/boxbackup
     block-size        must be a power of two, and usually the block or
                       fragment size of your file system
     dir0, dir1, dir2  are the directories used as the root of the raid