Backport from Bacula Enterprise

[bacula/bacula] / bacula / src / qt-console / bcomm / dircomm.h

diff --git a/bacula/src/qt-console/bcomm/dircomm.h b/bacula/src/qt-console/bcomm/dircomm.h
index 630c071f5ecb7dd43382e8b93db6e80fcae8f766..5d6446116a1c5285418d031cea1ad65d1afaea9a 100644 (file)
--- a/bacula/src/qt-console/bcomm/dircomm.h
+++ b/bacula/src/qt-console/bcomm/dircomm.h
@@ -1,23 +1,25 @@
 #ifndef _DIRCOMM_H_
 #define _DIRCOMM_H_
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
+   Copyright (C) 2000-2015 Kern Sibbald
    Copyright (C) 2007-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.
+   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.
 */
 /*
- *   Version $Id$
- *
  *   Kern Sibbald, January 2007
  */
 
@@ -45,7 +47,7 @@ public:
    ~DirComm();
    Console *m_console;
    int  sock_read();
-   bool authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons,
+   bool authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons, 
           char *buf, int buflen);
    bool is_connected() { return m_sock != NULL; };
    bool is_ready() { return is_connected() && m_at_prompt && m_at_main_prompt; };
@@ -54,7 +56,7 @@ public:
    bool is_notify_enabled() const;
    bool is_in_command() const { return m_in_command > 0; };
    void terminate();
-   bool connect_dir();
+   bool connect_dir();                     
    int read(void);
    int write(const char *msg);
    int write(QString msg);
@@ -63,7 +65,7 @@ public slots:
    void notify_read_dir(int fd);
 
 private:
-   BSOCK *m_sock;
+   BSOCK *m_sock;   
    bool m_at_prompt;
    bool m_at_main_prompt;
    bool m_sent_blank;