X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fversion.h;h=bddc78248988ff6bafc60fa24e633991a08ff7a9;hb=9862360c40f948caa5fbc88e0a40b2fd00bf39f6;hp=a58df209f673e35c702dd78fae15a82528398b6d;hpb=943080070a2c6e07a45d4bd234356907432c883b;p=bacula%2Fbacula

diff --git a/bacula/src/version.h b/bacula/src/version.h
index a58df209f6..bddc782489 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,10 +3,41 @@
  */
 
 #undef  VERSION
-#define VERSION "1.39.28"
-#define BDATE   "12 November 2006"
-#define LSMDATE "12Nov06"
-#define BYEAR "2006"       /* year for copyright messages in progs */
+#define VERSION "2.1.6"
+#define BDATE   "26 March 2007"
+#define LSMDATE "26Mar07"
+
+#define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n"
+#define BYEAR "2007"       /* year for copyright messages in progs */
+
+/*
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2000-2007 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.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
+
 
 /* Debug flags */
 #undef  DEBUG
@@ -18,17 +49,31 @@
 /* If this is set stdout will not be closed on startup */
 #define DEVELOPER 1
 
+#define DATA_ENCRYPTION 1
+
 #define USE_BSNPRINTF 1
 
-/* Debug flags not normally turned on */
+/* Turn on the following flag to enable batch attribute inserts
+ *  in the catalog.  This gives a large speedup.
+ */
+#define HAVE_BATCH_FILE_INSERT 1
 
-/* #define FILE_SEEK 1 */  
+
+/* Debug flags not normally turned on */
 
 /* #define TRACE_JCR_CHAIN 1 */
 /* #define TRACE_RES 1 */
 /* #define DEBUG_MEMSET 1 */
 /* #define DEBUG_MUTEX 1 */
 
+/*
+ * Set SMALLOC_SANITY_CHECK to zero to turn off, otherwise
+ *  it is the maximum memory malloced before Bacula will
+ *  abort.  Except for debug situations, this should be zero
+ */
+#define SMALLOC_SANITY_CHECK 0  /* 500000000  0.5 GB max */
+
+
 /* Check if header of tape block is zero before writing */
 /* #define DEBUG_BLOCK_ZEROING 1 */