Add extra Bacula plugin variables

diff --git a/bacula/src/filed/fd_plugins.c b/bacula/src/filed/fd_plugins.c
index b54adc9810f2462321688276513029b89764345d..e02b49e98dd1544a1d1be9af33df11d151b40135 100644 (file)
--- a/bacula/src/filed/fd_plugins.c
+++ b/bacula/src/filed/fd_plugins.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2011 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -36,6 +36,9 @@
 
 extern CLIENT *me;
 extern DLL_IMP_EXP char *exepath;
+extern DLL_IMP_EXP char *version;
+extern DLL_IMP_EXP char *dist_name;
+extern DLL_IMP_EXP int beef;
 
 const int dbglvl = 150;
 #ifdef HAVE_WIN32
@@ -1026,6 +1029,15 @@ static bRC baculaGetValue(bpContext *ctx, bVariable var, void *value)
    case bVarExePath:
       *(char **)value = exepath;
       break;
+   case bVarVersion:
+      *(char **)value = version;
+      break;
+   case bVarDistName:
+      *(char **)value = dist_name;
+      break;
+   case bVarBEEF:
+      *((int *)value) = beef;
+      break;
    default:
       break;
    }
@@ -1100,6 +1112,9 @@ static bRC baculaGetValue(bpContext *ctx, bVariable var, void *value)
    case bVarFDName:             /* get warning with g++ if we missed one */
    case bVarWorkingDir:
    case bVarExePath:
+   case bVarVersion:
+   case bVarDistName:
+   case bVarBEEF:
       break;
    }
    return bRC_OK;

diff --git a/bacula/src/filed/fd_plugins.h b/bacula/src/filed/fd_plugins.h
index c9db624158e09aabda8d8bd47e188842935d2e59..f5c80678dd62dbbf060bbd54ae65490ea0e2922a 100644 (file)
--- a/bacula/src/filed/fd_plugins.h
+++ b/bacula/src/filed/fd_plugins.h
@@ -180,7 +180,10 @@ typedef enum {
   bVarWorkingDir = 13,
   bVarWhere      = 14,
   bVarRegexWhere = 15,
-  bVarExePath    = 16
+  bVarExePath    = 16,
+  bVarVersion    = 17,
+  bVarDistName   = 18,
+  bVarBEEF       = 19
 } bVariable;
 
 /* Events that are passed to plugin */

diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c
index 3d7fc0e12da61f26de33f569a921ea2df50e2534..05e0c2aabfb9b5e383bfbbad38dfcf1050d102c7 100644 (file)
--- a/bacula/src/lib/message.c
+++ b/bacula/src/lib/message.c
@@ -57,7 +57,7 @@ bool prt_kaboom = false;              /* Print kaboom output */
 utime_t daemon_start_time = 0;        /* Daemon start time */
 const char *version = VERSION " (" BDATE ")";
 const char *dist_name = DISTNAME " " DISTVER;
-const int beef = BEEF;
+int beef = BEEF;
 char my_name[30] = {0};               /* daemon name is stored here */
 char host_name[50] = {0};             /* host machine name */
 char *exepath = (char *)NULL;

diff --git a/bacula/src/win32/lib/bacula32.def b/bacula/src/win32/lib/bacula32.def
index afd5a32379a516e5a404f784e24252b40e2f1616..997b9ec08c06f3d95a7c835639f709eae50f9559 100644 (file)
--- a/bacula/src/win32/lib/bacula32.def
+++ b/bacula/src/win32/lib/bacula32.def
@@ -780,3 +780,6 @@ plugin_bwrite DATA
 plugin_bread DATA
 plugin_blseek DATA
 exepath DATA
+beef DATA
+version DATA
+dist_name DATA

diff --git a/bacula/src/win32/lib/bacula64.def b/bacula/src/win32/lib/bacula64.def
index 3591f464c8e61134a61010662e4f18ed21d415ef..51f114ce1ec84df425fa6319a94e10f521a4f57a 100644 (file)
--- a/bacula/src/win32/lib/bacula64.def
+++ b/bacula/src/win32/lib/bacula64.def
@@ -770,3 +770,6 @@ plugin_bwrite DATA
 plugin_bread DATA
 plugin_blseek DATA
 exepath DATA
+beef DATA
+version DATA
+dist_name DATA