Update/enhance copyright/license + add .backups for Nicolas

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1495 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/COPYING b/bacula/COPYING
index 5087530b0f14a926482f430922ad18ecf572b625..c910dbd8ec2c725fe43c84290b0db4bdda481b00 100644 (file)
--- a/bacula/COPYING
+++ b/bacula/COPYING
@@ -1,17 +1,19 @@
 /*
-   Copyright (C) 2000, 2001 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 published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
 
    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.
+   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., 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA.
 
-   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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

diff --git a/bacula/README b/bacula/README
index a360ddd2d7e5f837b4c21de90ea6d4410919346d..c87326f8952fde9791a44c38f16a7db3eb148d47 100644 (file)
--- a/bacula/README
+++ b/bacula/README
@@ -92,16 +92,29 @@ FreeBSD users, pay special attention to the Device configuration
 parameters needed to deal with FreeBSD tape drivers.
 
 License:
-For the most part, Bacula is licensed under GPL version 2 or greater.        
-Bacula may be linked with any libraries permitted under the GPL, or 
-with any non-GPLed libraries, including OpenSSL, that are required for 
-its proper functioning, providing the source code of those non-GPLed
-libraries is freely available.
+For the most part, Bacula is licensed under the GPL version 2 or greater         
+with the following two additions:
+
+Linking: Bacula may be linked with any libraries permitted under
+the GPL, or with any non-GPLed libraries, including OpenSSL, that
+are required for its proper functioning, providing the source
+code of those non-GPLed libraries is non-proprietary and freely available.
+
+Termination for Patent Action: In addition to the termination
+clause specified in the GPL, this license shall terminate
+automatically and you may no longer exercise any of the rights
+granted to you by this license as of the date you commence an
+action, including a cross-claim or counterclaim, against any
+licensor of GPL software alleging that the software infringes a
+copyright, an intellectual property right, or a patent.
     
+=====================================
 
-In addition to GPL, there are also parts of Bacula that are licensed
-under LGPL so that they may be used in proprietary code to interface
-with Bacula, and there are parts that are in the public domain.
+In addition to the GPL, there are parts of Bacula that are licensed
+under the LGPL so that they may be used in proprietary code to interface
+with Bacula. 
+
+Finally there are parts of Bacula that are in the public domain.
              
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
 IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index 821e497368fc7dd6db81a807972919f786d6271e..a230136e9d6564b0fc3b573587c9b61b41fc3009 100644 (file)
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -102,6 +102,7 @@ static int sleepcmd(FILE *input, BSOCK *UA_sock);
 static void usage()
 {
    fprintf(stderr, _(
+"Copyright (C) 2000-2004 Kern Sibbald and John Walker\n"
 "\nVersion: " VERSION " (" BDATE ") %s %s %s\n\n"
 "Usage: bconsole [-s] [-c config_file] [-d debug_level]\n"
 "       -c <file>   set configuration file to file\n"

diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
index a7afb0f5bfdbc6038d7946e1d1a67afaa62cae09..3865ed058792b681054b740d153fb35ebee91e78 100644 (file)
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -73,6 +73,7 @@ extern URES res_all;
 static void usage()
 {
    fprintf(stderr, _(
+"Copyright (C) 2000-2004 Kern Sibbald and John Walker\n"
 "\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: dird [-f -s] [-c config_file] [-d debug_level] [config_file]\n"
 "       -c <file>   set configuration file to file\n"

diff --git a/bacula/src/dird/query.sql b/bacula/src/dird/query.sql
index 29787b9c402b764b44ace9de689b881967a688e7..e763d9d893beb8c8765a82a5e41b0c7ea4d21241 100644 (file)
--- a/bacula/src/dird/query.sql
+++ b/bacula/src/dird/query.sql
@@ -58,7 +58,8 @@ SELECT DISTINCT Job.JobId,Client.Name as Client,Level,StartTime,JobFiles,JobByte
 # 6
 :List all backups for a Client
 *Enter Client Name:
-SELECT DISTINCT Job.JobId,Client.Name as Client,Level,StartTime,JobFiles,JobBytes,VolumeName
+SELECT DISTINCT Job.JobId as JobId,Client.Name as Client,Level,StartTime,
+   JobFiles,JobBytes,VolumeName
  FROM Client,Job,JobMedia,Media
  WHERE Client.Name='%1'
  AND Client.ClientId=Job.ClientId

diff --git a/bacula/src/dird/sql_cmds.c b/bacula/src/dird/sql_cmds.c
index fa983d374e8b6f441b36a97e436c74a4a5d0b557..8c79737cd5f2e2dc6b928baa0aec8ce63a5c3325 100644 (file)
--- a/bacula/src/dird/sql_cmds.c
+++ b/bacula/src/dird/sql_cmds.c
@@ -33,6 +33,18 @@
 /* For ua_cmds.c */
 const char *list_pool = "SELECT * FROM Pool WHERE PoolId=%u";
 
+/* For ua_dotcmds.c */
+const char *client_backups =
+"SELECT DISTINCT Job.JobId,Client.Name as Client,Level,StartTime,"
+"JobFiles,JobBytes,VolumeName"
+" FROM Client,Job,JobMedia,Media"
+" WHERE Client.Name='%s'"
+" AND Client.ClientId=Job.ClientId"
+" AND JobStatus='T'"
+" AND JobMedia.JobId=Job.JobId AND JobMedia.MediaId=Media.MediaId"
+" ORDER BY Job.StartTime";
+
+
 /* ====== ua_prune.c */
 
 const char *cnt_File     = "SELECT count(*) FROM File WHERE JobId=%u";

diff --git a/bacula/src/dird/ua_dotcmds.c b/bacula/src/dird/ua_dotcmds.c
index c6cc6120ac28641d05c99521af291770eeb619d9..c9255d6594e69efa9a2219f14f7ee9b2b336f0a4 100644 (file)
--- a/bacula/src/dird/ua_dotcmds.c
+++ b/bacula/src/dird/ua_dotcmds.c
@@ -39,6 +39,7 @@ extern int r_first;
 extern int r_last;
 extern struct s_res resources[];
 extern char my_name[];
+extern const char *client_backups;
 
 /* Imported functions */
 extern int qmessagescmd(UAContext *ua, const char *cmd);
@@ -54,6 +55,7 @@ static int poolscmd(UAContext *ua, const char *cmd);
 static int storagecmd(UAContext *ua, const char *cmd);
 static int defaultscmd(UAContext *ua, const char *cmd);
 static int typescmd(UAContext *ua, const char *cmd);
+static int backupscmd(UAContext *ua, const char *cmd);
 static int levelscmd(UAContext *ua, const char *cmd);
 
 struct cmdstruct { const char *key; int (*func)(UAContext *ua, const char *cmd); const char *help; }; 
@@ -65,6 +67,7 @@ static struct cmdstruct commands[] = {
  { N_(".msgs"),       msgscmd,      NULL},
  { N_(".pools"),      poolscmd,     NULL},
  { N_(".types"),      typescmd,     NULL},
+ { N_(".backups"),    backupscmd,   NULL},
  { N_(".levels"),     levelscmd,    NULL},
  { N_(".storage"),    storagecmd,   NULL},
  { N_(".defaults"),   defaultscmd,  NULL},
@@ -199,6 +202,31 @@ static int typescmd(UAContext *ua, const char *cmd)
    return 1;
 }
 
+static int client_backups_handler(void *ctx, int num_field, char **row)
+{
+   UAContext *ua = (UAContext *)ctx;
+   bsendmsg(ua, "| %s | %s | %s | %s | %s | %s | %s |\n",
+      row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7]);
+   return 0;
+}
+
+static int backupscmd(UAContext *ua, const char *cmd)
+{
+   if (!open_db(ua)) {
+      return 1;
+   }
+   if (ua->argc == 2 && strcmp(ua->argk[1], "client") != 0) {
+      return 1;
+   }
+   Mmsg(&ua->cmd, client_backups, ua->argv[1]);
+   if (!db_sql_query(ua->db, ua->cmd, client_backups_handler, (void *)ua)) {
+      bsendmsg(ua, _("Query failed: %s. ERR=%s\n"), ua->cmd, db_strerror(ua->db));
+      return 1;
+   }
+   return 1;
+}
+
+
 static int levelscmd(UAContext *ua, const char *cmd)
 {
    bsendmsg(ua, "Incremental\n");

diff --git a/bacula/src/filed/filed.c b/bacula/src/filed/filed.c
index 3d8e788d22ecd4ea7e410224f1e93b6a6901b3ad..85a5a02fa67738b9a40727ff90b79f9b44c0a028 100644 (file)
--- a/bacula/src/filed/filed.c
+++ b/bacula/src/filed/filed.c
@@ -63,6 +63,7 @@ static pthread_t server_tid;
 static void usage()
 {
    fprintf(stderr, _(
+"Copyright (C) 2000-2004 Kern Sibbald and John Walker\n"
 "\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: bacula-fd [-f -s] [-c config_file] [-d debug_level]\n"  
 "        -c <file>   use <file> as configuration file\n"

diff --git a/bacula/src/stored/bcopy.c b/bacula/src/stored/bcopy.c
index c212fe67fc6001da900f6f423164b897495cbddd..d4a511198796c66c98f06b003166f9f4d9601b9e 100644 (file)
--- a/bacula/src/stored/bcopy.c
+++ b/bacula/src/stored/bcopy.c
@@ -54,6 +54,7 @@ bool forge_on = true;
 static void usage()
 {
    fprintf(stderr, _(
+"Copyright (C) 2002-2004 Kern Sibbald and John Walker.\n"
 "\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: bcopy [-d debug_level] <input-archive> <output-archive>\n"
 "       -b bootstrap      specify a bootstrap file\n"

diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c
index 0334f3f91f215215b8cafc5e0fc47008dcdcd5fe..daf491715cf51fece8beaeadaf4f35e5a64fbfd8 100644 (file)
--- a/bacula/src/stored/bextract.c
+++ b/bacula/src/stored/bextract.c
@@ -70,6 +70,7 @@ bool forge_on = false;
 static void usage()
 {
    fprintf(stderr,
+"Copyright (C) 2000-2004 Kern Sibbald and John Walker.\n"
 "\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: bextract <options> <bacula-archive-device-name> <directory-to-store-files>\n"
 "       -b <file>       specify a bootstrap file\n"

diff --git a/bacula/src/stored/bls.c b/bacula/src/stored/bls.c
index 34b879e1d7a9b02448025a5b82cea320845763d1..145c86079d94c18f3b26355800c6fafbd671f347 100644 (file)
--- a/bacula/src/stored/bls.c
+++ b/bacula/src/stored/bls.c
@@ -65,6 +65,7 @@ static BSR *bsr = NULL;
 static void usage()
 {
    fprintf(stderr,
+"Copyright (C) 2000-2004 Kern Sibbald and John Walker.\n"
 "\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: bls [-d debug_level] <physical-device-name>\n"
 "       -b <file>       specify a bootstrap file\n"

diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c
index fde90cac3df5d63867f4fa51e51a5968b57661ab..612016d1c9b0143ed814e063f714e98a66d1e8dc 100644 (file)
--- a/bacula/src/stored/bscan.c
+++ b/bacula/src/stored/bscan.c
@@ -103,6 +103,7 @@ bool forge_on = false;
 static void usage()
 {
    fprintf(stderr, _(
+"Copyright (C) 2001-2004 Kern Sibbald and John Walker.\n"
 "\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: bscan [ options ] <bacula-archive>\n"
 "       -b bootstrap      specify a bootstrap file\n"

diff --git a/bacula/src/stored/btape.c b/bacula/src/stored/btape.c
index ae8fb127410cc330359441224929873909827fdd..5ac4c6a46a2eddce8b501b540b2a5ddbf992d2f2 100644 (file)
--- a/bacula/src/stored/btape.c
+++ b/bacula/src/stored/btape.c
@@ -2489,6 +2489,7 @@ static void helpcmd()
 static void usage()
 {
    fprintf(stderr, _(
+"Copyright (C) 2000-2004 Kern Sibbald and John Walker.\n"
 "\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: btape <options> <device_name>\n"
 "       -b <file>   specify bootstrap file\n"

diff --git a/bacula/src/stored/stored.c b/bacula/src/stored/stored.c
index 957738336fb02483cd4b80d8cb9a2031098582fb..21d4fff4bb9c53f805e2e5914afc07f485f3f184 100644 (file)
--- a/bacula/src/stored/stored.c
+++ b/bacula/src/stored/stored.c
@@ -63,6 +63,7 @@ static workq_t dird_workq;          /* queue for processing connections */
 static void usage()
 {
    fprintf(stderr, _(
+"Copyright (C) 2000-2004 Kern Sibbald and John Walker.\n"
 "\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: stored [options] [-c config_file] [config_file]\n"
 "        -c <file>   use <file> as configuration file\n"

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 29d1678a830a9fcbd80253cc68f0fcdecc604d26..72b21a23671e74c60f143da11a56796b623924de 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.35.1"
-#define BDATE   "27 July 2004"
-#define LSMDATE "27Jul04"
+#define BDATE   "28 July 2004"
+#define LSMDATE "28Jul04"
 
 /* Debug flags */
 #undef  DEBUG