- Add Scratch to PoolType in PostgreSQL make...tables and do not

  permit NULL PoolTypes. Fix for bug 319 reported by Eric.
- Update LICENSE.
- Add quotes around filename in parse_config error message. Bug
  reported by Eric.

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

diff --git a/bacula/LICENSE b/bacula/LICENSE
index 14fedbc9e82251951e6daa679680336d5a0586b2..029ef03d390b4f493dec6021780fdbab2fa8f1a5 100644 (file)
--- a/bacula/LICENSE
+++ b/bacula/LICENSE
@@ -4,15 +4,17 @@ The name Bacula is a registered trademark.
 ===================================
 
 License:
-For the most part, Bacula is licensed under the GPL version 2 or greater         
-and any code that is Copyright Kern Sibbald and John Walker with the GPL
+For the most part, Bacula is licensed under the GPL version 2         
+and any code that is Copyright Kern Sibbald and John Walker or
+Copyright Kern Sibbald (after November 2004) with the GPL
 indication is so licensed, but with the following four 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.
+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 to the public.
 
 Termination for IP or Patent Action: 
 In addition to the termination clause specified in the GPL, this
@@ -54,7 +56,7 @@ Code falling under the above conditions will be marked as follows:
    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.
+   the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -68,13 +70,17 @@ Code falling under the above conditions will be marked as follows:
 
 =====================================
 
-The entire GPL is reproduced in the html manual distributed with this 
-source and can also be found online on the GNU web site as well
+The entire GPL is reproduced in the manuals distributed with the
+Bacula documentation and can also be found online on the GNU web site as well
 as at www.bacula.org.
 
-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. 
+Certain parts of the Bacula software are licensed by their
+copyright holder(s) undert the GPL with no modifications.  These
+software files are clearly marked as such.
+
+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.
              

diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index 35fa05366ed7fa34816a3857f256ddeb0a799d3f..9f6a28e16364c9e55f18b46596407a2b6301e2b1 100644 (file)
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -4,7 +4,15 @@
 General:
 
 Changes to 1.37.18:
+16May05
+- Add Scratch to PoolType in PostgreSQL make...tables and do not
+  permit NULL PoolTypes. Fix for bug 319 reported by Eric.
+- Update LICENSE.
+- Add quotes around filename in parse_config error message. Bug
+  reported by Eric.
 15May05
+- Change nested \include to \input so that sections are properly
+  included in the pdf manual -- update the Web site.
 - Set reconnect flag in MySQL packet to 1 to ensure that connection
   is re-established.  MySQL 5 changed default to 0. Fixes bug report.
 - Fix Scratch pool handling as reported in a bug by Eric Bollengier

diff --git a/bacula/src/c b/bacula/src/c
index fd4a244c2028dcff33e69ecc4a9a2225174a2ae4..2a786f750f97ac1df28e1861396bc51265311427 100644 (file)
--- a/bacula/src/c
+++ b/bacula/src/c
@@ -2,18 +2,13 @@
    Copyright (C) 2000-2005 Kern Sibbald
 
    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
+   version 2 as ammended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */

diff --git a/bacula/src/cats/make_postgresql_tables.in b/bacula/src/cats/make_postgresql_tables.in
index 151216e86811bea45b3618b6d771e691c25b1166..d1a6ad14df43f2b387c220492638de229b68f481 100644 (file)
--- a/bacula/src/cats/make_postgresql_tables.in
+++ b/bacula/src/cats/make_postgresql_tables.in
@@ -129,7 +129,7 @@ CREATE TABLE media
     volstatus        text        not null
        check (volstatus in ('Full','Archive','Append',
              'Recycle','Purged','Read-Only','Disabled',
-             'Error','Busy','Used','Cleaning')),
+             'Error','Busy','Used','Cleaning',"Scratch')),
     recycle          smallint    not null default 0,
     volretention      bigint     not null default 0,
     voluseduration    bigint     not null default 0,
@@ -200,7 +200,7 @@ CREATE TABLE pool
     autoprune        smallint    not null default 0,
     recycle          smallint    not null default 0,
     pooltype         text                          
-       check (pooltype is null or (pooltype in ('Backup','Copy','Cloned','Archive','Migration'))),
+      check (pooltype in ('Backup','Copy','Cloned','Archive','Migration','Scratch')),
     labeltype        integer     not null default 0,
     labelformat       text       not null,
     enabled          smallint    not null default 1,

diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index f793b5030cc03a781c13025dfecfabad9bfe34cf..02ce549bd08d998060a459fc77b5b21e8a2f90e2 100644 (file)
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -8,12 +8,12 @@
  */
 
 /*
-   Copyright (C) 2000-2004 Kern Sibbald and John Walker
+   Copyright (C) 2000-2005 Kern Sibbald
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
+   version 2.1 of the License.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -105,7 +105,7 @@ static int sleepcmd(FILE *input, BSOCK *UA_sock);
 static void usage()
 {
    fprintf(stderr, _(
-"Copyright (C) 2000-2004 Kern Sibbald and John Walker\n"
+"Copyright (C) 2000-2005 Kern Sibbald\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 fd0584ee69be5d2e5e7f05ebfc4cc1e170b152e1..e28738c4e8bf07e6d63728ad6e30ab80291d7692 100644 (file)
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -12,7 +12,7 @@
    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.
+   the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/bacula/src/lib/parse_conf.c b/bacula/src/lib/parse_conf.c
index 9afb58a22c990b6f1d50552a6ba0d50bc90e3610..c86199e677809ca0f19cd01caf240e16a317da6f 100755 (executable)
--- a/bacula/src/lib/parse_conf.c
+++ b/bacula/src/lib/parse_conf.c
@@ -737,6 +737,8 @@ enum parse_state {
  * Parse configuration file
  *
  * Return 0 if reading failed, 1 otherwise
+ *  Note, the default behavior unless you have set an alternate
+ *  scan_error handler is to die on an error.
  */
 int
 parse_config(const char *cf, LEX_ERROR_HANDLER *scan_error)
@@ -766,7 +768,7 @@ parse_config(const char *cf, LEX_ERROR_HANDLER *scan_error)
          }
          bstrncpy(lc->str, cf, sizeof(lc->str));
          lc->fname = lc->str;
-         scan_err2(lc, _("Cannot open config file %s: %s\n"),
+         scan_err2(lc, _("Cannot open config file \"%s\": %s\n"),
             lc->str, be.strerror());
          free(lc);
          return 0;

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 9dc7ed546613e04bbd5d3406a2b5bea8d4f07d6c..3234be1da4d9347c9c85fa928e54d9c51a96b27b 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.37.18"
-#define BDATE   "15 May 2005"
-#define LSMDATE "15May05"
+#define BDATE   "16 May 2005"
+#define LSMDATE "16May05"
 
 /* Debug flags */
 #undef  DEBUG