console: improved cmake build and include file position

core/src/console/console_globals.cc

@@ -0,0 +1,31 @@
+/*
+   BAREOS® - Backup Archiving REcovery Open Sourced
+
+   Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
+   Copyright (C) 2011-2012 Planets Communications B.V.
+   Copyright (C) 2013-2018 Bareos GmbH & Co. KG
+
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version three of the GNU Affero 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
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero 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.
+*/
+#include "console_globals.h"
+
+namespace console {
+
+   ConsoleResource *me = nullptr;
+   DirectorResource *director_resource = nullptr;
+   ConsoleResource *console_resource = nullptr;
+
+} /* namespace console */

core/src/console/console_globals.h

@@ -0,0 +1,37 @@
+/*
+   BAREOS® - Backup Archiving REcovery Open Sourced
+
+   Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
+   Copyright (C) 2011-2012 Planets Communications B.V.
+   Copyright (C) 2013-2018 Bareos GmbH & Co. KG
+
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version three of the GNU Affero 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
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero 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.
+*/
+#ifndef BAREOS_CONSOLE_CONSOLE_GLOBALS_H_
+#define BAREOS_CONSOLE_CONSOLE_GLOBALS_H_ 1
+
+namespace console {
+
+class ConsoleResource;
+class DirectorResource;
+
+extern ConsoleResource *me;
+extern ConsoleResource *console_resource;
+extern DirectorResource *director_resource;
+
+} /* namespace console */
+
+#endif /* BAREOS_CONSOLE_CONSOLE_GLOBALS_H_ */

core/src/lib/tls_openssl_private.cc

@@ -26,6 +26,8 @@
 #include "lib/bpoll.h"
 #include "lib/crypto_openssl.h"
 
+#include "parse_conf.h"
+
 #include <bareos.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
@@ -234,7 +236,7 @@ void TlsOpenSslPrivate::ServerContextInsertCredentials(const PskCredentials &cre
   TlsOpenSslPrivate::psk_server_credentials.insert(
       std::pair<const SSL_CTX *, PskCredentials>(openssl_ctx_, credentials));
 }
-#include "parse_conf.h"
+
 unsigned int TlsOpenSslPrivate::psk_server_cb(SSL *ssl,
                                               const char *identity,
                                               unsigned char *psk_output,