Did not intend to leave those debugging lines there.

[bacula/bacula] / bacula / src / qt-console / bat_conf.h

diff --git a/bacula/src/qt-console/bat_conf.h b/bacula/src/qt-console/bat_conf.h
index 34020550e69e6365525a76e9fd6f5a6f8dc4451a..d50f0ce3bbd254f3953174968553463bb34b2d19 100644 (file)
--- a/bacula/src/qt-console/bat_conf.h
+++ b/bacula/src/qt-console/bat_conf.h
@@ -7,8 +7,8 @@
    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 plus additions
-   that are listed in the file LICENSE.
+   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
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   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.
@@ -61,13 +61,15 @@ enum {
 
 
 /* Definition of the contents of each Resource */
-struct DIRRES {
+class DIRRES {
+public:
    RES   hdr;
-   int   DIRport;                     /* UA server port */
+   uint32_t DIRport;                  /* UA server port */
    char *address;                     /* UA server address */
    char *password;                    /* UA server password */
-   int tls_enable;                    /* Enable TLS */
-   int tls_require;                   /* Require TLS */
+   bool tls_authenticate;             /* Authenticate with tls */
+   bool tls_enable;                   /* Enable TLS */
+   bool tls_require;                  /* Require TLS */
    char *tls_ca_certfile;             /* TLS CA Certificate File */
    char *tls_ca_certdir;              /* TLS CA Certificate Directory */
    char *tls_certfile;                /* TLS Client Certificate File */
@@ -82,26 +84,33 @@ struct DIRRES {
 
 inline char *DIRRES::name() const { return hdr.name; }
 
+
 struct CONFONTRES {
    RES   hdr;
    char *fontface;                    /* Console Font specification */
-   int require_ssl;                   /* Require SSL on all connections */
 };
 
-struct CONRES {
+class CONRES {
+public:
    RES   hdr;
    char *password;                    /* UA server password */
-   int tls_enable;                    /* Enable TLS on all connections */
-   int tls_require;                   /* Require TLS on all connections */
+   bool tls_authenticate;             /* Authenticate with tls */
+   bool tls_enable;                   /* Enable TLS on all connections */
+   bool tls_require;                  /* Require TLS on all connections */
    char *tls_ca_certfile;             /* TLS CA Certificate File */
    char *tls_ca_certdir;              /* TLS CA Certificate Directory */
    char *tls_certfile;                /* TLS Client Certificate File */
    char *tls_keyfile;                 /* TLS Client Key File */
-   utime_t heartbeat_interval;        /* Dir heartbeat interval */
+   utime_t heartbeat_interval;        /* Cons heartbeat interval */
 
    TLS_CONTEXT *tls_ctx;              /* Shared TLS Context */
+
+   /* Methods */
+   char *name() const;
 };
 
+inline char *CONRES::name() const { return hdr.name; }
+
 
 /* Define the Union of all the above
  * resource structure definitions.
@@ -115,4 +124,8 @@ union u_res {
 
 typedef union u_res URES;
 
+#define GetConsoleResWithName(x) ((CONRES *)GetResWithName(R_CONSOLE, (x)))
+#define GetDirResWithName(x) ((DIRRES *)GetResWithName(R_DIRECTOR, (x)))
+
+
 #endif /* _BAT_CONF_H_ */