kes More copyright changes.

[bacula/bacula] / bacula / src / gnome2-console / console_conf.h

diff --git a/bacula/src/gnome2-console/console_conf.h b/bacula/src/gnome2-console/console_conf.h
index 9fba0fd7ddcb70a4b28affadc90f17be6886276e..7a3100443666c610c0867b7fe2498f3222eb4268 100644 (file)
--- a/bacula/src/gnome2-console/console_conf.h
+++ b/bacula/src/gnome2-console/console_conf.h
@@ -5,65 +5,104 @@
  *
  *     Version $Id$
  */
+/*
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2002-2006 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 plus additions
+   that are listed 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 John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 
 #ifndef __CONSOLE_CONF_H_
 #define __CONSOLE_CONF_H_
 
 /*
- * Resource codes -- they must be sequential for indexing   
+ * Resource codes -- they must be sequential for indexing
  */
 
 enum {
    R_DIRECTOR = 1001,
    R_CONSOLE,
    R_CONSOLE_FONT,
+   R_FIRST = R_DIRECTOR,
+   R_LAST = R_CONSOLE_FONT            /* Keep this updated */
 };
 
-#define R_FIRST     R_DIRECTOR
-#define R_LAST     R_CONSOLE_FONT
-
 /*
  * Some resource attributes
  */
-#define R_NAME                       1020
-#define R_ADDRESS                    1021
-#define R_PASSWORD                   1022
-#define R_TYPE                       1023
-#define R_BACKUP                     1024
+enum {
+   R_NAME = 1020,
+   R_ADDRESS,
+   R_PASSWORD,
+   R_TYPE,
+   R_BACKUP
+};
 
 
 /* Definition of the contents of each Resource */
-struct s_res_dir {
-   RES  hdr;
-   int  DIRport;                     /* UA server port */
-   char *address;                    /* UA server address */
-   char *password;                   /* UA server password */
-   int enable_ssl;                   /* Use SSL */
+struct DIRRES {
+   RES   hdr;
+   int   DIRport;                     /* UA server port */
+   char *address;                     /* UA server address */
+   char *password;                    /* UA server password */
+   int tls_enable;                    /* Enable TLS */
+   int 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 */
+   char *tls_keyfile;                 /* TLS Client Key File */
+
+   TLS_CONTEXT *tls_ctx;              /* Shared TLS Context */
 };
-typedef struct s_res_dir DIRRES;
 
-struct s_con_font {
-   RES  hdr;
-   char *fontface;                   /* Console Font specification */
-   int require_ssl;                  /* Require SSL on all connections */
+struct CONFONTRES {
+   RES   hdr;
+   char *fontface;                    /* Console Font specification */
+   int require_ssl;                   /* Require SSL on all connections */
 };
-typedef struct s_con_font CONFONTRES;
 
-struct s_con_res {
-   RES  hdr;
-   char *password;                   /* UA server password */
-   int require_ssl;                  /* Require SSL on all connections */
+struct CONRES {
+   RES   hdr;
+   char *password;                    /* UA server password */
+   int tls_enable;                    /* Enable TLS on all connections */
+   int 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 */
+
+   TLS_CONTEXT *tls_ctx;              /* Shared TLS Context */
 };
-typedef struct s_con_res CONRES;
 
 
 /* Define the Union of all the above
  * resource structure definitions.
  */
 union u_res {
-   struct s_res_dir    dir_res;
-   struct s_con_font   con_font;
-   struct s_con_res    con_res;
+   DIRRES dir_res;
+   CONRES con_res;
+   CONFONTRES con_font;
    RES hdr;
 };