Fix Bacula bug #2045 -- multiply defined daemon_event

diff --git a/bacula/src/stored/bcopy.c b/bacula/src/stored/bcopy.c
index 5fe76df129d694c504a1e4754640209b5040ebc5..ce1144e1f7654da2df6e5b2a59a42b4ec2f9cd6d 100644 (file)
--- a/bacula/src/stored/bcopy.c
+++ b/bacula/src/stored/bcopy.c
@@ -24,8 +24,6 @@
 #include "bacula.h"
 #include "stored.h"
 
-/* Dummy functions */
-int generate_daemon_event(JCR *jcr, const char *event) { return 1; }
 extern bool parse_sd_config(CONFIG *config, const char *configfile, int exit_code);
 
 /* Forward referenced functions */

diff --git a/bacula/src/stored/bls.c b/bacula/src/stored/bls.c
index c7d195701498bc202c86c3e63bd905160631ae70..ce8e53f82266c66fafc965f2e80451e981988835 100644 (file)
--- a/bacula/src/stored/bls.c
+++ b/bacula/src/stored/bls.c
@@ -25,8 +25,6 @@
 #include "stored.h"
 #include "findlib/find.h"
 
-/* Dummy functions */
-int generate_daemon_event(JCR *jcr, const char *event) { return 1; }
 extern bool parse_sd_config(CONFIG *config, const char *configfile, int exit_code);
 
 static void do_blocks(char *infname);

diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c
index fbfe75a3b788376a9ded850e2b903345d405f6a5..0a029711bbc69beb4fbdf5f4e78d50e05e37b772 100644 (file)
--- a/bacula/src/stored/bscan.c
+++ b/bacula/src/stored/bscan.c
@@ -29,8 +29,6 @@
 #include "cats/cats.h"
 #include "cats/sql_glue.h"
 
-/* Dummy functions */
-int generate_daemon_event(JCR *jcr, const char *event) { return 1; }
 extern bool parse_sd_config(CONFIG *config, const char *configfile, int exit_code);
 
 /* Forward referenced functions */

diff --git a/bacula/src/stored/btape.c b/bacula/src/stored/btape.c
index 2b49fb99a3995a38a4a0d412217348cdb02fc840..3ca97ffcb631bca590ffb4de5a5b9338d2379471 100644 (file)
--- a/bacula/src/stored/btape.c
+++ b/bacula/src/stored/btape.c
@@ -34,8 +34,6 @@
 #include "vtape_dev.h"
 #endif
 
-/* Dummy functions */
-int generate_daemon_event(JCR *jcr, const char *event) { return 1; }
 extern bool parse_sd_config(CONFIG *config, const char *configfile, int exit_code);
 
 /* External subroutines */

diff --git a/bacula/src/tools/bsmtp.c b/bacula/src/tools/bsmtp.c
index b2274384bd18ee2d6ddbd0a31cbac3bd98276c92..a3e5eef5411f992b990108c21f25f96c68bd1125 100644 (file)
--- a/bacula/src/tools/bsmtp.c
+++ b/bacula/src/tools/bsmtp.c
@@ -60,13 +60,6 @@
 #include <lmcons.h>
 #endif
 
-/*
- * Dummy functions
- */
-int generate_daemon_event(JCR *jcr, const char *event)
-{
-   return 1;
-}
 
 #ifndef MAXSTRING
 #define MAXSTRING 254

diff --git a/bacula/src/tools/dbcheck.c b/bacula/src/tools/dbcheck.c
index 069d07aeeff6ef31b57275e735e2f93d96804830..60f330155ca7b1a6c23b88c57d33e9e1a0c9a2fb 100644 (file)
--- a/bacula/src/tools/dbcheck.c
+++ b/bacula/src/tools/dbcheck.c
@@ -30,12 +30,6 @@
 
 extern bool parse_dir_config(CONFIG *config, const char *configfile, int exit_code);
 
-/*
- * Dummy functions
- */
-int generate_daemon_event(JCR *jcr, const char *event)
-   { return 1; }
-
 typedef struct s_id_ctx {
    int64_t *Id;                       /* ids to be modified */
    int num_ids;                       /* ids stored */

diff --git a/bacula/src/tools/drivetype.c b/bacula/src/tools/drivetype.c
index 23cb42dce944cf81e3d53289148e877d30d86238..3112e37844d352dc56b7541d1a47904e83e00db3 100644 (file)
--- a/bacula/src/tools/drivetype.c
+++ b/bacula/src/tools/drivetype.c
@@ -25,10 +25,6 @@
 #include "bacula.h"
 #include "findlib/find.h"
 
-/* Dummy functions */
-int generate_daemon_event(JCR *jcr, const char *event)
-   { return 1; }
-
 static void usage()
 {
    fprintf(stderr, _(

diff --git a/bacula/src/tools/fstype.c b/bacula/src/tools/fstype.c
index 2335a20a84f323701e55ca60d1035d28f2a52d62..3e2e3150a6259ac8419e9740cf70ede6ce82f298 100644 (file)
--- a/bacula/src/tools/fstype.c
+++ b/bacula/src/tools/fstype.c
@@ -26,10 +26,6 @@
 #include "findlib/find.h"
 #include "lib/mntent_cache.h"
 
-/* Dummy functions */
-int generate_daemon_event(JCR *jcr, const char *event)
-   { return 1; }
-
 static void usage()
 {
    fprintf(stderr, _(

diff --git a/bacula/src/tools/testfind.c b/bacula/src/tools/testfind.c
index 71bc7a7b0d50702aa5c77ea93b88120043c061a9..d19a82a852b6d2b6134df25dd11432645a35046d 100644 (file)
--- a/bacula/src/tools/testfind.c
+++ b/bacula/src/tools/testfind.c
@@ -31,7 +31,6 @@
 #endif
 
 /* Dummy functions */
-int generate_daemon_event(JCR *jcr, const char *event) { return 1; }
 int generate_job_event(JCR *jcr, const char *event) { return 1; }
 void generate_plugin_event(JCR *jcr, bEventType eventType, void *value) { }
 extern bool parse_dir_config(CONFIG *config, const char *configfile, int exit_code);

diff --git a/bacula/src/tools/testls.c b/bacula/src/tools/testls.c
index 6cedf40bc8ad26c9679b6a6828a3fadd2e6629f5..ebf1bb3adcea315ab4516965953ba0ad456d6323 100644 (file)
--- a/bacula/src/tools/testls.c
+++ b/bacula/src/tools/testls.c
@@ -26,7 +26,6 @@
 #include "findlib/find.h"
 
 /* Dummy functions */
-int generate_daemon_event(JCR *jcr, const char *event) { return 1; }
 int generate_job_event(JCR *jcr, const char *event) { return 1; }
 void generate_plugin_event(JCR *jcr, bEventType eventType, void *value) { }