Misc

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

diff --git a/bacula/COPYING b/bacula/COPYING
index c910dbd8ec2c725fe43c84290b0db4bdda481b00..062c2fbb48d4571190213094b8698488a2a98467 100644 (file)
--- a/bacula/COPYING
+++ b/bacula/COPYING
@@ -1,19 +1,2 @@
-/*
-   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.
-
-   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.
-
- */
+Please see the file LICENSE concerning the terms of the license,
+copying and such.

diff --git a/bacula/LICENSE b/bacula/LICENSE
new file mode 100644 (file)
index 0000000..157d2fd
--- /dev/null
+++ b/bacula/LICENSE
@@ -0,0 +1,65 @@
+Trademark:
+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
+indication is so licensed, but 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.
+
+Code falling under the above conditions will be marked as follows:
+
+   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.
+
+   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.
+
+=====================================
+
+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
+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. 
+
+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
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/bacula/README b/bacula/README
index c87326f8952fde9791a44c38f16a7db3eb148d47..f40e27db969fba51922dc7e001b51a10c7ef6a2f 100644 (file)
--- a/bacula/README
+++ b/bacula/README
@@ -92,38 +92,4 @@ 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 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 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
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Please see the file LICENSE for the terms of the license.

diff --git a/bacula/src/cats/bdb.c b/bacula/src/cats/bdb.c
index cd2bbb24a3667b87d6023626a3fd1eaa92418473..7545e3d941c3fa12d2a4dc95867bad14bb45aa4e 100644 (file)
--- a/bacula/src/cats/bdb.c
+++ b/bacula/src/cats/bdb.c
@@ -48,7 +48,7 @@ uint32_t bacula_db_version = 0;
 
 /* Forward referenced functions */
 
-extern char *working_directory;
+extern const char *working_directory;
 
 /* List of open databases */
 static BQUEUE db_list = {&db_list, &db_list};

diff --git a/bacula/src/cats/sql.c b/bacula/src/cats/sql.c
index 7b3ebd4db88d47b486b333ac93d6e02298be28b2..ad7ce60caad1692216742c1b46d31ad7a1d9e280 100644 (file)
--- a/bacula/src/cats/sql.c
+++ b/bacula/src/cats/sql.c
@@ -468,7 +468,7 @@ list_result(JCR *jcr, B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type t
         field = sql_fetch_field(mdb);
         if (row[i] == NULL) {
             bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, "NULL");
-        } else if (IS_NUM(field->type) && !jcr->gui) {
+        } else if (IS_NUM(field->type) && !jcr->gui && is_an_integer(row[i])) {
             bsnprintf(buf, sizeof(buf), " %*s |", (int)field->max_length,       
                      add_commas(row[i], ewc));
         } else {
@@ -490,7 +490,7 @@ vertical_list:
         field = sql_fetch_field(mdb);
         if (row[i] == NULL) {
             bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, "NULL");
-        } else if (IS_NUM(field->type) && !jcr->gui) {
+        } else if (IS_NUM(field->type) && !jcr->gui && is_an_integer(row[i])) {
             bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, 
                add_commas(row[i], ewc));
         } else {

diff --git a/bacula/src/dird/ua_tree.c b/bacula/src/dird/ua_tree.c
index 8198717b69a30ce8cc2470793c20d97ac566731a..c59d1888fae2d69ffcf13c2497e7c2f019a9c2a0 100644 (file)
--- a/bacula/src/dird/ua_tree.c
+++ b/bacula/src/dird/ua_tree.c
@@ -92,7 +92,8 @@ bool user_select_files_from_tree(TREE_CTX *tree)
 
    bsendmsg(tree->ua, _( 
       "\nYou are now entering file selection mode where you add and\n"
-      "remove files to be restored. All files are initially added.\n"
+      "remove files to be restored. No files are initially added, unless\n"
+      "you used the \"all\" keyword on the command line.\n"
       "Enter \"done\" to leave this mode.\n\n"));
    /*
     * Enter interactive command handler allowing selection