From: Kern Sibbald Date: Sat, 10 Apr 2004 11:12:15 +0000 (+0000) Subject: Update version X-Git-Tag: Release-1.34.1~61 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dd8246856f0de479c3d75008e20c8ee18c77780;p=thirdparty%2Fbacula.git Update version git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1192 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/src/lib/alist.c b/bacula/src/lib/alist.c index 9d90a97f8..d82c45ed7 100644 --- a/bacula/src/lib/alist.c +++ b/bacula/src/lib/alist.c @@ -11,7 +11,7 @@ * */ /* - Copyright (C) 2000-2003 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/alloc.c b/bacula/src/lib/alloc.c index f25ee348b..241749a43 100644 --- a/bacula/src/lib/alloc.c +++ b/bacula/src/lib/alloc.c @@ -6,7 +6,7 @@ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/attr.c b/bacula/src/lib/attr.c index 4c5ae2d54..aaf335d28 100644 --- a/bacula/src/lib/attr.c +++ b/bacula/src/lib/attr.c @@ -7,7 +7,7 @@ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2003-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/base64.c b/bacula/src/lib/base64.c index ae8e2bfd6..d956dca29 100644 --- a/bacula/src/lib/base64.c +++ b/bacula/src/lib/base64.c @@ -7,7 +7,7 @@ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/bget_msg.c b/bacula/src/lib/bget_msg.c index 0e03ebc4d..a1a366c05 100644 --- a/bacula/src/lib/bget_msg.c +++ b/bacula/src/lib/bget_msg.c @@ -8,7 +8,7 @@ * */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2001-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/bnet.c b/bacula/src/lib/bnet.c index a9a339b10..9d2b42911 100644 --- a/bacula/src/lib/bnet.c +++ b/bacula/src/lib/bnet.c @@ -9,7 +9,7 @@ * Version $Id$ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/bacula/src/lib/bnet_pkt.c b/bacula/src/lib/bnet_pkt.c index fe4acf92a..5de132b41 100644 --- a/bacula/src/lib/bnet_pkt.c +++ b/bacula/src/lib/bnet_pkt.c @@ -7,7 +7,7 @@ * Version $Id$ */ /* - Copyright (C) 2002-2003 Kern Sibbald and John Walker + Copyright (C) 2002-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/bnet_server.c b/bacula/src/lib/bnet_server.c index 26f7f3c88..18b0c3164 100644 --- a/bacula/src/lib/bnet_server.c +++ b/bacula/src/lib/bnet_server.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/bpipe.c b/bacula/src/lib/bpipe.c index 2bde779f2..21f628350 100644 --- a/bacula/src/lib/bpipe.c +++ b/bacula/src/lib/bpipe.c @@ -7,7 +7,7 @@ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2002-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/bshm.c b/bacula/src/lib/bshm.c index d6c7b3ae8..ed65fce4d 100644 --- a/bacula/src/lib/bshm.c +++ b/bacula/src/lib/bshm.c @@ -20,7 +20,7 @@ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/bsys.c b/bacula/src/lib/bsys.c index 7251ac9a1..1c0f40d7f 100644 --- a/bacula/src/lib/bsys.c +++ b/bacula/src/lib/bsys.c @@ -8,7 +8,7 @@ * Version $Id$ */ /* - Copyright (C) 2000-2003 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/cram-md5.c b/bacula/src/lib/cram-md5.c index be1ed8db4..c567e8621 100644 --- a/bacula/src/lib/cram-md5.c +++ b/bacula/src/lib/cram-md5.c @@ -8,7 +8,7 @@ * Version $Id$ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/bacula/src/lib/crc32.c b/bacula/src/lib/crc32.c index 412499dc3..6451c0a24 100644 --- a/bacula/src/lib/crc32.c +++ b/bacula/src/lib/crc32.c @@ -7,7 +7,7 @@ * */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2001-2004 Kern Sibbald and John Walker This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/bacula/src/lib/daemon.c b/bacula/src/lib/daemon.c index 65410f34c..38b029987 100644 --- a/bacula/src/lib/daemon.c +++ b/bacula/src/lib/daemon.c @@ -14,7 +14,7 @@ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/edit.c b/bacula/src/lib/edit.c index 9647fdf4b..77da41352 100644 --- a/bacula/src/lib/edit.c +++ b/bacula/src/lib/edit.c @@ -7,7 +7,7 @@ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/events.c b/bacula/src/lib/events.c index d9833f3f1..30e61ccf5 100644 --- a/bacula/src/lib/events.c +++ b/bacula/src/lib/events.c @@ -7,7 +7,7 @@ * */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2001-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/hmac.c b/bacula/src/lib/hmac.c index 8c79f98c2..2c5d747c8 100644 --- a/bacula/src/lib/hmac.c +++ b/bacula/src/lib/hmac.c @@ -8,7 +8,7 @@ * Version $Id$ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/bacula/src/lib/htable.c b/bacula/src/lib/htable.c index 088b8c96a..130adf86a 100644 --- a/bacula/src/lib/htable.c +++ b/bacula/src/lib/htable.c @@ -23,7 +23,7 @@ * */ /* - Copyright (C) 2000-2003 Kern Sibbald and John Walker + Copyright (C) 2003-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/jcr.c b/bacula/src/lib/jcr.c index 513aed124..86113f337 100755 --- a/bacula/src/lib/jcr.c +++ b/bacula/src/lib/jcr.c @@ -9,7 +9,7 @@ * */ /* - Copyright (C) 2000-2003 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/lex.c b/bacula/src/lib/lex.c index e9cf48493..09b941a08 100644 --- a/bacula/src/lib/lex.c +++ b/bacula/src/lib/lex.c @@ -1,12 +1,14 @@ /* * Lexical scanner for Bacula configuration file * + * Kern Sibbald, 2000 + * * Version $Id$ * */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/mem_pool.c b/bacula/src/lib/mem_pool.c index 229868bc0..63e3786af 100644 --- a/bacula/src/lib/mem_pool.c +++ b/bacula/src/lib/mem_pool.c @@ -21,7 +21,7 @@ */ /* - Copyright (C) 2000-2003 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c index e6cb8f010..40b923ade 100755 --- a/bacula/src/lib/message.c +++ b/bacula/src/lib/message.c @@ -8,7 +8,7 @@ */ /* - Copyright (C) 2000-2003 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/parse_conf.c b/bacula/src/lib/parse_conf.c index 429edf4d9..5972581af 100755 --- a/bacula/src/lib/parse_conf.c +++ b/bacula/src/lib/parse_conf.c @@ -34,7 +34,7 @@ */ /* - Copyright (C) 2000-2003 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/queue.c b/bacula/src/lib/queue.c index 1fa05ed9c..19fd12599 100644 --- a/bacula/src/lib/queue.c +++ b/bacula/src/lib/queue.c @@ -13,7 +13,7 @@ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/rwlock.c b/bacula/src/lib/rwlock.c index f6912b519..4df665ec1 100644 --- a/bacula/src/lib/rwlock.c +++ b/bacula/src/lib/rwlock.c @@ -13,7 +13,7 @@ * */ /* - Copyright (C) 2000-2003 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/scan.c b/bacula/src/lib/scan.c index 0289b85d0..c77917b58 100644 --- a/bacula/src/lib/scan.c +++ b/bacula/src/lib/scan.c @@ -7,7 +7,7 @@ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/semlock.c b/bacula/src/lib/semlock.c index 2b5263167..78ea114bb 100644 --- a/bacula/src/lib/semlock.c +++ b/bacula/src/lib/semlock.c @@ -13,7 +13,7 @@ * */ /* - Copyright (C) 2000-2003 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/serial.c b/bacula/src/lib/serial.c index f82030702..6c2598e0c 100644 --- a/bacula/src/lib/serial.c +++ b/bacula/src/lib/serial.c @@ -7,7 +7,7 @@ Version $Id$ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/signal.c b/bacula/src/lib/signal.c index a636a7440..4e32d4440 100644 --- a/bacula/src/lib/signal.c +++ b/bacula/src/lib/signal.c @@ -15,7 +15,7 @@ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c index 013c9102d..e23d8abaf 100644 --- a/bacula/src/lib/util.c +++ b/bacula/src/lib/util.c @@ -7,7 +7,7 @@ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/lib/workq.c b/bacula/src/lib/workq.c index dbe0001ff..318a20eb3 100755 --- a/bacula/src/lib/workq.c +++ b/bacula/src/lib/workq.c @@ -28,7 +28,7 @@ * */ /* - Copyright (C) 2000-2003 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/version.h b/bacula/src/version.h index ee8bd6a27..b58968161 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -1,9 +1,9 @@ /* */ #undef VERSION -#define VERSION "1.34.0" +#define VERSION "1.35.0" #define VSTRING "1" -#define BDATE "06 Apr 2004" -#define LSMDATE "06Apr04" +#define BDATE "10 Apr 2004" +#define LSMDATE "10Apr04" /* Debug flags */ #undef DEBUG diff --git a/bacula/src/win32/compat/compat.cpp b/bacula/src/win32/compat/compat.cpp index 579224d08..016a3a29a 100644 --- a/bacula/src/win32/compat/compat.cpp +++ b/bacula/src/win32/compat/compat.cpp @@ -2,7 +2,10 @@ // compat.cpp -- compatibilty layer to make bacula-fd run // natively under windows // -// Copyright (C)2004 Raider Solutions, Inc +// Copyright transferred from Raider Solutions, Inc to +// Kern Sibbald and John Walker by express permission. +// +// Copyright (C) 2004 Kern Sibbald and John Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as @@ -21,9 +24,6 @@ // // Author : Christopher S. Hull // Created On : Sat Jan 31 15:55:00 2004 -// Last Modified By: Christopher S. Hull -// Last Modified On: Tue Feb 24 11:27:33 2004 -// Update Count : 665 // $Id$ #include diff --git a/bacula/src/win32/compat/compat.h b/bacula/src/win32/compat/compat.h index 3b1cfa461..c0caa8af3 100644 --- a/bacula/src/win32/compat/compat.h +++ b/bacula/src/win32/compat/compat.h @@ -1,6 +1,10 @@ /* -*- Mode: C -*- * compat.h -- -// Copyright (C)2004 Raider Solutions, Inc. + */ +// Copyright transferred from Raider Solutions, Inc to +// Kern Sibbald and John Walker by express permission. +// +// Copyright (C) 2004 Kern Sibbald and John Walker // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as @@ -81,9 +85,9 @@ typedef long time_t; #if __STDC__ typedef _dev_t dev_t; typedef __int64 ino_t; -typedef __int64 off_t; /* STDC=1 means we can define this */ +typedef __int64 off_t; /* STDC=1 means we can define this */ #else -typedef long _off_t; /* must be same as sys/types.h */ +typedef long _off_t; /* must be same as sys/types.h */ #endif typedef signed char int8_t; typedef int BOOL;