Change copyright as per agreement with FSFE

[bacula/bacula] / bacula / src / qt-console / bcomm / dircomm_auth.cpp

diff --git a/bacula/src/qt-console/bcomm/dircomm_auth.cpp b/bacula/src/qt-console/bcomm/dircomm_auth.cpp
index 548a26e5772cdcebfc991e7a4b9f6f912462362f..8c24ca31b7e9dce84da2c6e8d7265c789c07cf53 100644 (file)
--- a/bacula/src/qt-console/bcomm/dircomm_auth.cpp
+++ b/bacula/src/qt-console/bcomm/dircomm_auth.cpp
@@ -1,17 +1,20 @@
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
-   The main author of Bacula is Kern Sibbald, with contributions from many
-   others, a complete list can be found in the file AUTHORS.
+   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.
 
-   Bacula® is a registered trademark of Kern Sibbald.
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 
 /*
@@ -46,8 +49,8 @@ static char newOKhello[]   = "1000 OK: %d";
 /*
  * Authenticate Director
  */
-bool DirComm::authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons,
-                char *errmsg, int errmsg_len)
+bool DirComm::authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons, 
+                char *errmsg, int errmsg_len) 
 {
    BSOCK *dir = jcr->dir_bsock;
    int tls_local_need = BNET_TLS_NONE;
@@ -156,10 +159,10 @@ bool DirComm::authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons,
       return false;
    } else {
       /* If Dir version exists, get it */
-      sscanf(dir->msg, newOKhello, &dir_version);
+      sscanf(dir->msg, newOKhello, &dir_version); 
    }
 
-   if (m_conn == 0) {
+   if (m_conn == 0) { 
       bsnprintf(errmsg, errmsg_len, "%s", dir->msg);
    }
    return true;
@@ -169,7 +172,7 @@ bail_out:
    bsnprintf(errmsg, errmsg_len, _("Authorization problem with Director at \"%s:%d\"\n"
              "Most likely the passwords do not agree.\n"
              "If you are using TLS, there may have been a certificate validation error during the TLS handshake.\n"
-             "Please see " MANUAL_AUTH_URL " for help.\n"),
+             "For help, please see " MANUAL_AUTH_URL "\n"),
              dir->host(), dir->port());
    return false;
 }