From: Eric Bollengier Date: Wed, 4 Jan 2012 11:05:16 +0000 (+0100) Subject: tweak copyright X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d61803b0fd33d89c830754b38b22c32613b31ab2;p=bacula%2Fbacula tweak copyright --- diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c index 8cbd4d470b..cf894617db 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-2011 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. @@ -2078,8 +2078,10 @@ extern "C" char *job_code_callback_director(JCR *jcr, const char* param) break; case 'x': return jcr->spool_data ? yes : no; + break; case 'D': return my_name; + break; } return NULL; } diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c index 2af39ad5af..3c5822935d 100644 --- a/bacula/src/dird/ua_status.c +++ b/bacula/src/dird/ua_status.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2001-2008 Free Software Foundation Europe e.V. + Copyright (C) 2001-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. @@ -31,7 +31,6 @@ * * Kern Sibbald, August MMI * - * Version $Id$ */ @@ -295,8 +294,9 @@ void list_dir_status_header(UAContext *ua) ua->send_msg(_("%s Version: %s (%s) %s %s %s\n"), my_name, VERSION, BDATE, HOST_OS, DISTNAME, DISTVER); bstrftime_nc(dt, sizeof(dt), daemon_start_time); - ua->send_msg(_("Daemon started %s. Jobs: run=%d, running=%d\n"), dt, - num_jobs_run, job_count()); + ua->send_msg(_("Daemon started %s. Jobs: run=%d, running=%d " + "mode=%d,%d\n"), dt, + num_jobs_run, job_count(), (int)DEVELOPER_MODE, (int)BEEF); ua->send_msg(_(" Heap: heap=%s smbytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"), edit_uint64_with_commas((char *)sbrk(0)-(char *)start_heap, b1), edit_uint64_with_commas(sm_bytes, b2), diff --git a/bacula/src/findlib/find_one.c b/bacula/src/findlib/find_one.c index b2d7f98810..355779bc85 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-2010 Free Software Foundation Europe e.V. + Copyright (C) 2000-2009 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,6 +34,8 @@ Thanks to the TAR programmers. + Version $Id$ + */ #include "bacula.h" @@ -420,9 +422,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 b2a63b9c6c..24b1a90056 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-2011 Free Software Foundation Europe e.V. + Copyright (C) 2000-2008 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,6 +33,7 @@ * 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 ac48765a1e..65ea155f5c 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-2011 Free Software Foundation Europe e.V. + Copyright (C) 2006-2008 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,6 +30,8 @@ * * Eric Bollengier, March 2007 * + * Version $Id$ + * */ diff --git a/bacula/src/lib/crypto.c b/bacula/src/lib/crypto.c index 7ffa20ecc5..04d2910b6e 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-2011 Free Software Foundation Europe e.V. + Copyright (C) 2005-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. diff --git a/bacula/src/lib/lockmgr.c b/bacula/src/lib/lockmgr.c index adf21b8dcd..2105b275f6 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-2011 Free Software Foundation Europe e.V. + Copyright (C) 2008-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. @@ -118,7 +118,7 @@ typedef enum { LMGR_WHITE, /* never seen */ LMGR_BLACK, /* no loop */ - LMGR_GREY, /* seen before */ + LMGR_GREY /* seen before */ } lmgr_color_t; /* diff --git a/bacula/src/lib/openssl.c b/bacula/src/lib/openssl.c index 57fea7cacf..b8ff9978fe 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-2011 Free Software Foundation Europe e.V. + Copyright (C) 2005-2009 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 7bf0266904..56c20f67c5 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-2011 Free Software Foundation Europe e.V. + Copyright (C) 2005-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. diff --git a/bacula/src/plugins/fd/delta-test-fd.c b/bacula/src/plugins/fd/delta-test-fd.c index 5138e6b515..b365711901 100644 --- a/bacula/src/plugins/fd/delta-test-fd.c +++ b/bacula/src/plugins/fd/delta-test-fd.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. diff --git a/bacula/src/plugins/fd/fd_common.h b/bacula/src/plugins/fd/fd_common.h index 9f9cdf57af..666c24cd2a 100644 --- a/bacula/src/plugins/fd/fd_common.h +++ b/bacula/src/plugins/fd/fd_common.h @@ -1,7 +1,7 @@ /* - Bacula® - The Network Backup Solution + Bacula(R) - The Network Backup Solution - Copyright (C) 2010-2010 Bacula Systems(R) SA + Copyright (C) 2010-2011 Bacula Systems(R) SA The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Bacula® is a registered trademark of Kern Sibbald. + Bacula(R) is a registered trademark of Kern Sibbald. Bacula Systems(R) is a trademark of Bacula Systems SA. Bacula Enterprise(TM) is a trademark of Bacula Systems SA. diff --git a/bacula/src/stored/dev.h b/bacula/src/stored/dev.h index 38fb9ff9db..28c378820b 100644 --- a/bacula/src/stored/dev.h +++ b/bacula/src/stored/dev.h @@ -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. @@ -64,7 +64,6 @@ * */ - #ifndef __DEV_H #define __DEV_H 1