Backport from BEE

[bacula/bacula] / bacula / src / cats / bdb_sqlite.h

diff --git a/bacula/src/cats/bdb_sqlite.h b/bacula/src/cats/bdb_sqlite.h
index 7226b357d7c761b4f48b3ae90bacc21b4383fae8..39a0b33bccb551aea9644bc4e47b9ce253fb2521 100644 (file)
--- a/bacula/src/cats/bdb_sqlite.h
+++ b/bacula/src/cats/bdb_sqlite.h
@@ -1,30 +1,17 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2009-2011 Free Software Foundation Europe e.V.
+   Copyright (C) 2009-2014 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.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version three of the GNU Affero General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
+   The main author of Bacula is Kern Sibbald, with contributions from many
+   others, a complete list can be found in the file AUTHORS.
 
-   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 Affero General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
+   You may use this file and others of this release according to the
+   license defined in the LICENSE file, which includes the Affero General
+   Public License, v3.0 ("AGPLv3") and some additional permissions and
+   terms pursuant to its AGPLv3 Section 7.
 
    Bacula® is a registered trademark of Kern Sibbald.
-
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
 */
 #ifndef __BDB_SQLITE_H_
 #define __BDB_SQLITE_H_ 1
@@ -45,8 +32,8 @@ public:
    ~B_DB_SQLITE();
 
    /* Used internaly by sqlite.c to access fields in db_sql_query() */
-   void set_column_names(char **res, int nb) { 
-      m_col_names = res; 
+   void set_column_names(char **res, int nb) {
+      m_col_names = res;
       m_num_fields = nb;
       m_field_number = 0;
    }