Ticket #21866: bacula-default-configs.patch

File bacula-default-configs.patch, 4.4 KB (added by claunia@…, 15 years ago)

Gentoo's Bacula 3.0.2 patch

  • console/console.c

     
    105105static int execcmd(FILE *input, BSOCK *UA_sock);
    106106
    107107
    108 #define CONFIG_FILE "bconsole.conf"   /* default configuration file */
     108#define CONFIG_FILE "/etc/bacula/bconsole.conf"   /* default configuration file */
    109109
    110110static void usage()
    111111{
  • dird/dird.c

     
    8585extern URES res_all;
    8686#endif
    8787
    88 #define CONFIG_FILE "bacula-dir.conf" /* default configuration file */
     88#define CONFIG_FILE "/etc/bacula/bacula-dir.conf" /* default configuration file */
    8989
    9090static void usage()
    9191{
  • filed/filed.c

     
    5050void *start_heap;
    5151
    5252
    53 #define CONFIG_FILE "bacula-fd.conf" /* default config file */
     53#define CONFIG_FILE "/etc/bacula/bacula-fd.conf" /* default config file */
    5454
    5555char *configfile = NULL;
    5656static bool foreground = false;
  • gnome2-console/console.c

     
    9393static guint initial;
    9494static int numdir = 0;
    9595
    96 #define CONFIG_FILE "./bgnome-console.conf"   /* default configuration file */
     96#define CONFIG_FILE "/etc/bacula/bgnome-console.conf"   /* default configuration file */
    9797
    9898static void usage()
    9999{
  • stored/bcopy.c

     
    6161static SESSION_LABEL sessrec;
    6262
    6363static CONFIG *config;
    64 #define CONFIG_FILE "bacula-sd.conf"
     64#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
    6565char *configfile = NULL;
    6666STORES *me = NULL;                    /* our Global resource */
    6767bool forge_on = false;                /* proceed inspite of I/O errors */
  • stored/bextract.c

     
    6969static CONFIG *config;
    70 #define CONFIG_FILE "bacula-sd.conf"
     70#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
    7171char *configfile = NULL;
    7272STORES *me = NULL;                    /* our Global resource */
    7373bool forge_on = false;
  • stored/bls.c

     
    6060static uint32_t num_files = 0;
    6161static ATTR *attr;
    6262static CONFIG *config;
    6363
    64 #define CONFIG_FILE "bacula-sd.conf"
     64#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
    6565char *configfile = NULL;
    6666STORES *me = NULL;                    /* our Global resource */
  • stored/bscan.c

     bool forge_on = false;
     
    106106static CONFIG *config;
    107 #define CONFIG_FILE "bacula-sd.conf"
     107#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
    108108char *configfile = NULL;
    109109STORES *me = NULL;                    /* our Global resource */
  • stored/btape.c

     
    105105/* Static variables */
    106106static CONFIG *config;
    107 #define CONFIG_FILE "bacula-sd.conf"
     107#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
    108108char *configfile = NULL;
    109109
    110110#define MAX_CMD_ARGS 30
  • stored/stored.c

     
    5252
    5353extern "C" void *device_initialization(void *arg);
    5454
    55 #define CONFIG_FILE "bacula-sd.conf"  /* Default config file */
     55#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"  /* Default config file */
    5656
    5757/* Global variables exported */
    5858char OK_msg[]   = "3000 OK\n";
  • tray-monitor/tray-monitor.c

     
    104104
    105105PangoFontDescription *font_desc = NULL;
    106106
    107 #define CONFIG_FILE "./tray-monitor.conf"   /* default configuration file */
     107#define CONFIG_FILE "/etc/bacula/tray-monitor.conf"   /* default configuration file */
    108108
    109109static void usage()
    110110{
  • qt-console/main.cpp

    old new  
    4949
    5050extern bool parse_bat_config(CONFIG *config, const char *configfile, int exit_code);
    5151
    52 #define CONFIG_FILE "bat.conf"     /* default configuration file */
     52#define CONFIG_FILE "/etc/bacula/bat.conf"     /* default configuration file */
    5353
    5454/* Static variables */
    5555static CONFIG *config;