From 999ce1b7588307e483ed4e20c0a22cf0e9da22ee Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Wed, 4 Jan 2012 19:05:34 +0100 Subject: [PATCH] Tweak copyrights again --- bacula/src/dird/dird.c | 10 ---------- bacula/src/dird/dird_conf.c | 2 +- bacula/src/findlib/find_one.c | 10 ++++------ bacula/src/lib/bnet.c | 3 +-- bacula/src/lib/breg.c | 4 +--- bacula/src/lib/crypto.c | 2 +- bacula/src/lib/lockmgr.c | 2 +- bacula/src/lib/openssl.c | 2 +- bacula/src/lib/rblist.c | 2 +- 9 files changed, 11 insertions(+), 26 deletions(-) diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c index c00ec5e532..71284807b7 100644 --- a/bacula/src/dird/dird.c +++ b/bacula/src/dird/dird.c @@ -1119,16 +1119,6 @@ static bool check_catalog(cat_op mode) /* Set type in global for debugging */ set_db_type(db_get_type(db)); -#ifdef BEEF_DEMO - /* - * Demo mode only allows SQLite3 - */ - if (!bstrcmp(db_get_type(db), "SQLite3")) { - Jmsg(NULL, M_FATAL, 0, _("Failed to initialize database backend\n")); - OK = false; - } -#endif - db_close_database(NULL, db); } return OK; diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c index cf894617db..7dcf591748 100644 --- a/bacula/src/dird/dird_conf.c +++ b/bacula/src/dird/dird_conf.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2010 Free Software Foundation Europe e.V. + Copyright (C) 2000-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. diff --git a/bacula/src/findlib/find_one.c b/bacula/src/findlib/find_one.c index 355779bc85..b2d7f98810 100644 --- a/bacula/src/findlib/find_one.c +++ b/bacula/src/findlib/find_one.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2009 Free Software Foundation Europe e.V. + Copyright (C) 2000-2010 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. @@ -34,8 +34,6 @@ Thanks to the TAR programmers. - Version $Id$ - */ #include "bacula.h" @@ -422,9 +420,9 @@ find_one_file(JCR *jcr, FF_PKT *ff_pkt, * Ignore this entry if no_dump() returns true */ if (no_dump(jcr, ff_pkt)) { - Dmsg1(100, "'%s' ignored (NODUMP flag set)\n", - ff_pkt->fname); - return 1; + Dmsg1(100, "'%s' ignored (NODUMP flag set)\n", + ff_pkt->fname); + return 1; } /* diff --git a/bacula/src/lib/bnet.c b/bacula/src/lib/bnet.c index 24b1a90056..b2a63b9c6c 100644 --- a/bacula/src/lib/bnet.c +++ b/bacula/src/lib/bnet.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2008 Free Software Foundation Europe e.V. + Copyright (C) 2000-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. @@ -33,7 +33,6 @@ * Adapted and enhanced for Bacula, originally written * for inclusion in the Apcupsd package * - * Version $Id$ */ diff --git a/bacula/src/lib/breg.c b/bacula/src/lib/breg.c index 65ea155f5c..ac48765a1e 100644 --- a/bacula/src/lib/breg.c +++ b/bacula/src/lib/breg.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2006-2008 Free Software Foundation Europe e.V. + Copyright (C) 2006-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. @@ -30,8 +30,6 @@ * * Eric Bollengier, March 2007 * - * Version $Id$ - * */ diff --git a/bacula/src/lib/crypto.c b/bacula/src/lib/crypto.c index 04d2910b6e..7ffa20ecc5 100644 --- a/bacula/src/lib/crypto.c +++ b/bacula/src/lib/crypto.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2005-2010 Free Software Foundation Europe e.V. + Copyright (C) 2005-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. diff --git a/bacula/src/lib/lockmgr.c b/bacula/src/lib/lockmgr.c index 2105b275f6..93654bac48 100644 --- a/bacula/src/lib/lockmgr.c +++ b/bacula/src/lib/lockmgr.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2008-2010 Free Software Foundation Europe e.V. + Copyright (C) 2008-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. diff --git a/bacula/src/lib/openssl.c b/bacula/src/lib/openssl.c index b8ff9978fe..57fea7cacf 100644 --- a/bacula/src/lib/openssl.c +++ b/bacula/src/lib/openssl.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2005-2009 Free Software Foundation Europe e.V. + Copyright (C) 2005-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. diff --git a/bacula/src/lib/rblist.c b/bacula/src/lib/rblist.c index 56c20f67c5..7bf0266904 100644 --- a/bacula/src/lib/rblist.c +++ b/bacula/src/lib/rblist.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2005-2010 Free Software Foundation Europe e.V. + Copyright (C) 2005-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. -- 2.39.5