Sophie: bacula-1:3.0.3-2mdv2010.0 src

bacula-3.0.3-2mdv2010.0.src.rpm

diff -p -up bacula-3.0.2/autoconf/Make.common.in.config bacula-3.0.2/autoconf/Make.common.in
--- bacula-3.0.2/autoconf/Make.common.in.config	2009-05-16 11:25:36.000000000 -0300
+++ bacula-3.0.2/autoconf/Make.common.in	2009-07-22 10:47:32.000000000 -0300
@@ -81,7 +81,7 @@ CFLAGS = @CFLAGS@ @OPENSSL_INC@
 CPPFLAGS = @CPPFLAGS@ @OPENSSL_INC@
 LDFLAGS = @LDFLAGS@
 TTOOL_LDFLAGS = @TTOOL_LDFLAGS@
-#DEFS = @DEFS@ @LOCAL_DEFS@
+DEFS = -DCONFIG_DIR="\"@sysconfdir@\""
 LIBS = @LIBS@
 WRAPLIBS = @WRAPLIBS@
 DINCLUDE = @DINCLUDE@
diff -p -up bacula-3.0.2/src/console/console.c.config bacula-3.0.2/src/console/console.c
--- bacula-3.0.2/src/console/console.c.config	2009-05-14 12:02:23.000000000 -0300
+++ bacula-3.0.2/src/console/console.c	2009-07-22 10:47:32.000000000 -0300
@@ -111,7 +111,7 @@ static int eolcmd(FILE *input, BSOCK *UA
 #endif
 
 
-#define CONFIG_FILE "bconsole.conf"   /* default configuration file */
+#define CONFIG_FILE CONFIG_DIR "/bconsole.conf"   /* default configuration file */
 
 static void usage()
 {
diff -p -up bacula-3.0.2/src/dird/dird.c.config bacula-3.0.2/src/dird/dird.c
--- bacula-3.0.2/src/dird/dird.c.config	2009-07-15 07:08:00.000000000 -0300
+++ bacula-3.0.2/src/dird/dird.c	2009-07-22 10:47:32.000000000 -0300
@@ -102,7 +102,7 @@ typedef enum {
 } cat_op;
 static bool check_catalog(cat_op mode);
 
-#define CONFIG_FILE "bacula-dir.conf" /* default configuration file */
+#define CONFIG_FILE CONFIG_DIR "/bacula-dir.conf" /* default configuration file */
 
 
 static void usage()
diff -p -up bacula-3.0.2/src/filed/filed.c.config bacula-3.0.2/src/filed/filed.c
--- bacula-3.0.2/src/filed/filed.c.config	2008-12-09 17:21:38.000000000 -0200
+++ bacula-3.0.2/src/filed/filed.c	2009-07-22 10:47:32.000000000 -0300
@@ -63,7 +63,7 @@ CLIENT *me;                           /*
 bool no_signals = false;
 void *start_heap;
 
-#define CONFIG_FILE "bacula-fd.conf" /* default config file */
+#define CONFIG_FILE CONFIG_DIR "/bacula-fd.conf" /* default config file */
 
 char *configfile = NULL;
 static bool foreground = false;
diff -p -up bacula-3.0.2/src/gnome2-console/console.c.config bacula-3.0.2/src/gnome2-console/console.c
--- bacula-3.0.2/src/gnome2-console/console.c.config	2008-07-14 07:42:59.000000000 -0300
+++ bacula-3.0.2/src/gnome2-console/console.c	2009-07-22 10:47:32.000000000 -0300
@@ -96,7 +96,7 @@ static guint initial;
 static int numdir = 0;
 static CONFIG *config;
 
-#define CONFIG_FILE "./bgnome-console.conf"   /* default configuration file */
+#define CONFIG_FILE CONFIG_DIR "/bgnome-console.conf"   /* default configuration file */
 
 static void usage()
 {
diff -p -up bacula-3.0.2/src/stored/bcopy.c.config bacula-3.0.2/src/stored/bcopy.c
--- bacula-3.0.2/src/stored/bcopy.c.config	2008-12-23 11:28:03.000000000 -0200
+++ bacula-3.0.2/src/stored/bcopy.c	2009-07-22 10:47:32.000000000 -0300
@@ -61,7 +61,7 @@ static DEV_BLOCK *out_block;
 static SESSION_LABEL sessrec;
 
 static CONFIG *config;
-#define CONFIG_FILE "bacula-sd.conf"
+#define CONFIG_FILE CONFIG_DIR "/bacula-sd.conf"
 char *configfile = NULL;
 STORES *me = NULL;                    /* our Global resource */
 bool forge_on = false;                /* proceed inspite of I/O errors */
diff -p -up bacula-3.0.2/src/stored/bextract.c.config bacula-3.0.2/src/stored/bextract.c
--- bacula-3.0.2/src/stored/bextract.c.config	2008-12-23 11:28:03.000000000 -0200
+++ bacula-3.0.2/src/stored/bextract.c	2009-07-22 10:47:32.000000000 -0300
@@ -67,7 +67,7 @@ static uint32_t wsize;                /*
 static uint64_t fileAddr = 0;         /* file write address */
 
 static CONFIG *config;
-#define CONFIG_FILE "bacula-sd.conf"
+#define CONFIG_FILE CONFIG_DIR "/bacula-sd.conf"
 char *configfile = NULL;
 STORES *me = NULL;                    /* our Global resource */
 bool forge_on = false;
diff -p -up bacula-3.0.2/src/stored/bls.c.config bacula-3.0.2/src/stored/bls.c
--- bacula-3.0.2/src/stored/bls.c.config	2009-07-10 17:03:15.000000000 -0300
+++ bacula-3.0.2/src/stored/bls.c	2009-07-22 10:47:32.000000000 -0300
@@ -61,7 +61,7 @@ static uint32_t num_files = 0;
 static ATTR *attr;
 static CONFIG *config;
 
-#define CONFIG_FILE "bacula-sd.conf"
+#define CONFIG_FILE CONFIG_DIR "/bacula-sd.conf"
 char *configfile = NULL;
 STORES *me = NULL;                    /* our Global resource */
 bool forge_on = false;
diff -p -up bacula-3.0.2/src/stored/bscan.c.config bacula-3.0.2/src/stored/bscan.c
--- bacula-3.0.2/src/stored/bscan.c.config	2009-03-07 17:59:46.000000000 -0300
+++ bacula-3.0.2/src/stored/bscan.c	2009-07-22 10:47:32.000000000 -0300
@@ -104,7 +104,7 @@ static int num_media = 0;
 static int num_files = 0;
 
 static CONFIG *config;
-#define CONFIG_FILE "bacula-sd.conf"
+#define CONFIG_FILE CONFIG_DIR "/bacula-sd.conf"
 char *configfile = NULL;
 STORES *me = NULL;                    /* our Global resource */
 bool forge_on = false;                /* proceed inspite of I/O errors */
diff -p -up bacula-3.0.2/src/stored/btape.c.config bacula-3.0.2/src/stored/btape.c
--- bacula-3.0.2/src/stored/btape.c.config	2009-06-17 13:39:11.000000000 -0300
+++ bacula-3.0.2/src/stored/btape.c	2009-07-22 10:47:32.000000000 -0300
@@ -104,7 +104,7 @@ static void do_unfill();
 
 /* Static variables */
 static CONFIG *config;
-#define CONFIG_FILE "bacula-sd.conf"
+#define CONFIG_FILE CONFIG_DIR "/bacula-sd.conf"
 char *configfile = NULL;
 
 #define MAX_CMD_ARGS 30
diff -p -up bacula-3.0.2/src/stored/stored.c.config bacula-3.0.2/src/stored/stored.c
--- bacula-3.0.2/src/stored/stored.c.config	2008-12-09 17:21:38.000000000 -0200
+++ bacula-3.0.2/src/stored/stored.c	2009-07-22 10:47:32.000000000 -0300
@@ -71,7 +71,7 @@ static void cleanup_old_files();
 
 extern "C" void *device_initialization(void *arg);
 
-#define CONFIG_FILE "bacula-sd.conf"  /* Default config file */
+#define CONFIG_FILE CONFIG_DIR "/bacula-sd.conf"  /* Default config file */
 
 /* Global variables exported */
 char OK_msg[]   = "3000 OK\n";
diff -p -up bacula-3.0.2/src/tray-monitor/tray-monitor.c.config bacula-3.0.2/src/tray-monitor/tray-monitor.c
--- bacula-3.0.2/src/tray-monitor/tray-monitor.c.config	2009-01-30 07:20:41.000000000 -0200
+++ bacula-3.0.2/src/tray-monitor/tray-monitor.c	2009-07-22 10:47:32.000000000 -0300
@@ -105,7 +105,7 @@ static gboolean blinkstate = TRUE;
 
 PangoFontDescription *font_desc = NULL;
 
-#define CONFIG_FILE "./tray-monitor.conf"   /* default configuration file */
+#define CONFIG_FILE CONFIG_DIR "/tray-monitor.conf"   /* default configuration file */
 
 static void usage()
 {
diff -p -up bacula-3.0.2/src/wx-console/wxbmainframe.cpp.config bacula-3.0.2/src/wx-console/wxbmainframe.cpp
--- bacula-3.0.2/src/wx-console/wxbmainframe.cpp.config	2008-07-14 07:42:59.000000000 -0300
+++ bacula-3.0.2/src/wx-console/wxbmainframe.cpp	2009-07-22 10:47:32.000000000 -0300
@@ -403,7 +403,7 @@ void wxbMainFrame::StartConsoleThread(co
             }
             configfile += L"Library/Preferences/org.bacula.wxconsole.conf";
 #else
-            wxFileName filename(::wxGetCwd(), wxT("bwx-console.conf"));
+	    wxFileName filename(wxT(CONFIG_DIR), wxT("bwx-console.conf"));
             filename.MakeAbsolute();
             configfile = filename.GetLongPath();
 #ifdef HAVE_WIN32