summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2008-07-24 15:16:40 +0200
committerReinhard Tartler <siretart@tauware.de>2008-07-24 15:16:40 +0200
commit116bf1e1a327c693643a0a25696a3b2cc552300c (patch)
tree08ea0e24f786e8209bee992e54655699cdddf267 /lib
parenta6562e5c53162fe92884438c74226c10def2cc8b (diff)
import boxbackup_0.11~rc2-2.dsc
Diffstat (limited to 'lib')
-rw-r--r--lib/common/BoxPortsAndFiles.h.in6
-rw-r--r--lib/common/Logging.cpp1
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/common/BoxPortsAndFiles.h.in b/lib/common/BoxPortsAndFiles.h.in
index fcc0ddce..fd34a3bb 100644
--- a/lib/common/BoxPortsAndFiles.h.in
+++ b/lib/common/BoxPortsAndFiles.h.in
@@ -31,9 +31,9 @@
#define BOX_GET_DEFAULT_BBSTORED_CONFIG_FILE \
GetDefaultConfigFilePath("bbstored.conf").c_str()
#else
-#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "@sysconfdir_expanded@/box/bbackupd.conf"
-#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "@sysconfdir_expanded@/box/raidfile.conf"
-#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "@sysconfdir_expanded@/box/bbstored.conf"
+#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "@sysconfdir_expanded@/boxbackup/bbackupd.conf"
+#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "@sysconfdir_expanded@/boxbackup/raidfile.conf"
+#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "@sysconfdir_expanded@/boxbackup/bbstored.conf"
#endif
#endif // BOXPORTSANDFILES__H
diff --git a/lib/common/Logging.cpp b/lib/common/Logging.cpp
index 008e5916..383f44cc 100644
--- a/lib/common/Logging.cpp
+++ b/lib/common/Logging.cpp
@@ -50,6 +50,7 @@
#include <errno.h>
#include <time.h>
+#include <string.h> // for stderror
#ifdef HAVE_SYSLOG_H
#include <syslog.h>