Change copyright as per agreement with FSFE

[bacula/bacula] / bacula / src / qt-console / clients / clients.cpp

diff --git a/bacula/src/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp
index d336f4e2fe2b0d92eccf3cde5d94126216714862..37f288a94f0fb943a02cdd730846353ed68fa28e 100644 (file)
--- a/bacula/src/qt-console/clients/clients.cpp
+++ b/bacula/src/qt-console/clients/clients.cpp
@@ -1,34 +1,23 @@
 /*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2007-2009 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 two of the GNU General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
-
-   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., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-   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.
+   Bacula(R) - The Network Backup Solution
+
+   Copyright (C) 2000-2016 Kern Sibbald
+
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
+
+   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.
+
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
  
 /*
- *   Version $Id$
- *
  *  Clients Class
  *
  *   Dirk Bartley, March 2007
@@ -43,7 +32,7 @@
 #include "status/clientstat.h"
 #include "util/fmtwidgetitem.h"
 
-Clients::Clients()
+Clients::Clients() : Pages()
 {
    setupUi(this);
    m_name = tr("Clients");
@@ -67,7 +56,7 @@ Clients::~Clients()
 }
 
 /*
- * The main meat of the class!!  The function that querries the director and 
+ * The main meat of the class!!  The function that queries the director and 
  * creates the widgets with appropriate values.
  */
 void Clients::populateTable()
@@ -127,6 +116,10 @@ void Clients::populateTable()
          foreach (QString resultline, results) {
             QStringList fieldlist = resultline.split("\t");
 
+            if (fieldlist.size() < 5) { // Uname is checked after
+               Pmsg1(0, "Unexpected line %s\n", resultline.toUtf8().data());
+               continue;
+            }
             if (m_firstpopulation) {
                settingsOpenStatus(fieldlist[0]);
             }
@@ -153,7 +146,11 @@ void Clients::populateTable()
             item.setNumericFld(col++, fld.next());
 
             /* uname */
-            item.setTextFld(col++, fld.next());
+            if (fld.hasNext()) {
+               item.setTextFld(col++, fld.next());
+            } else {
+               item.setTextFld(col++, "");
+            }
 
             row++;
          }