From 861a55f4a5c8076b373a0e16ab33682b97baf8e2 Mon Sep 17 00:00:00 2001
From: Frank Ueberschar <frank.ueberschar@bareos.com>
Date: Wed, 6 Nov 2019 12:37:29 +0100
Subject: [PATCH] jcr: separate file for AuthenticationProtocolType

---
 core/src/dird/backup.cc                |  1 +
 core/src/dird/dird_conf.cc             |  1 +
 core/src/dird/migrate.cc               |  1 +
 core/src/dird/ndmp_dma_generic.cc      |  1 +
 core/src/dird/stats.cc                 |  1 +
 core/src/dird/storage.cc               |  1 +
 core/src/dird/ua_cmds.cc               |  1 +
 core/src/dird/ua_label.cc              |  1 +
 core/src/dird/ua_purge.cc              |  1 +
 core/src/dird/ua_status.cc             |  1 +
 core/src/include/auth_protocol_types.h | 35 ++++++++++++++++++++++++++
 core/src/include/jcr.h                 | 11 --------
 12 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 core/src/include/auth_protocol_types.h

diff --git a/core/src/dird/backup.cc b/core/src/dird/backup.cc
index 8f6d881e820..0b0657be887 100644
--- a/core/src/dird/backup.cc
+++ b/core/src/dird/backup.cc
@@ -48,6 +48,7 @@
 #include "dird/sd_cmds.h"
 #include "ndmp/smc.h"
 #include "dird/storage.h"
+#include "include/auth_protocol_types.h"
 #include "include/protocol_types.h"
 
 #include "cats/sql.h"
diff --git a/core/src/dird/dird_conf.cc b/core/src/dird/dird_conf.cc
index 7284b49c7f0..c5c61ce6afa 100644
--- a/core/src/dird/dird_conf.cc
+++ b/core/src/dird/dird_conf.cc
@@ -52,6 +52,7 @@
 #include "dird/inc_conf.h"
 #include "dird/dird_globals.h"
 #include "dird/jcr_private.h"
+#include "include/auth_protocol_types.h"
 #include "include/protocol_types.h"
 #include "lib/berrno.h"
 #include "lib/breg.h"
diff --git a/core/src/dird/migrate.cc b/core/src/dird/migrate.cc
index 50f632420d0..b62cc1c729c 100644
--- a/core/src/dird/migrate.cc
+++ b/core/src/dird/migrate.cc
@@ -52,6 +52,7 @@
 #include "dird/ua_server.h"
 #include "dird/ua_purge.h"
 #include "dird/ua_run.h"
+#include "include/auth_protocol_types.h"
 #include "lib/edit.h"
 #include "lib/parse_conf.h"
 #include "lib/util.h"
diff --git a/core/src/dird/ndmp_dma_generic.cc b/core/src/dird/ndmp_dma_generic.cc
index b91b9a0be8a..6a4d22db69c 100644
--- a/core/src/dird/ndmp_dma_generic.cc
+++ b/core/src/dird/ndmp_dma_generic.cc
@@ -31,6 +31,7 @@
 #include "dird.h"
 #include "dird/jcr_private.h"
 #include "dird/dird_globals.h"
+#include "include/auth_protocol_types.h"
 
 #if HAVE_NDMP
 #define SMTAPE_MIN_BLOCKSIZE 4096        /**< 4 Kb */
diff --git a/core/src/dird/stats.cc b/core/src/dird/stats.cc
index 56884b8c074..1e042dc180b 100644
--- a/core/src/dird/stats.cc
+++ b/core/src/dird/stats.cc
@@ -34,6 +34,7 @@
 #include "cats/sql_pooling.h"
 #include "dird/sd_cmds.h"
 #include "dird/ua_server.h"
+#include "include/auth_protocol_types.h"
 #include "lib/bnet.h"
 #include "lib/parse_conf.h"
 #include "lib/util.h"
diff --git a/core/src/dird/storage.cc b/core/src/dird/storage.cc
index 0207f1d4420..618331deab2 100644
--- a/core/src/dird/storage.cc
+++ b/core/src/dird/storage.cc
@@ -34,6 +34,7 @@
 #include "dird/dird_globals.h"
 #include "dird/jcr_private.h"
 #include "dird/sd_cmds.h"
+#include "include/auth_protocol_types.h"
 #include "lib/parse_conf.h"
 #include "lib/util.h"
 
diff --git a/core/src/dird/ua_cmds.cc b/core/src/dird/ua_cmds.cc
index 3085cbbe2f9..9ec5c9821f0 100644
--- a/core/src/dird/ua_cmds.cc
+++ b/core/src/dird/ua_cmds.cc
@@ -48,6 +48,7 @@
 #include "dird/ua_status.h"
 #include "dird/ua_purge.h"
 #include "dird/ua_run.h"
+#include "include/auth_protocol_types.h"
 #include "lib/bnet.h"
 #include "lib/edit.h"
 #include "lib/parse_conf.h"
diff --git a/core/src/dird/ua_label.cc b/core/src/dird/ua_label.cc
index 6bf84cc7ca4..b87673c524b 100644
--- a/core/src/dird/ua_label.cc
+++ b/core/src/dird/ua_label.cc
@@ -46,6 +46,7 @@
 #include "dird/ua_input.h"
 #include "dird/ua_label.h"
 #include "dird/ua_select.h"
+#include "include/auth_protocol_types.h"
 #include "lib/crypto_wrap.h"
 #include "lib/passphrase.h"
 #include "lib/util.h"
diff --git a/core/src/dird/ua_purge.cc b/core/src/dird/ua_purge.cc
index 666ed6a11aa..5f6f2b070f4 100644
--- a/core/src/dird/ua_purge.cc
+++ b/core/src/dird/ua_purge.cc
@@ -43,6 +43,7 @@
 #include "dird/ua_select.h"
 #include "dird/ua_prune.h"
 #include "dird/ua_purge.h"
+#include "include/auth_protocol_types.h"
 #include "lib/edit.h"
 #include "lib/util.h"
 
diff --git a/core/src/dird/ua_status.cc b/core/src/dird/ua_status.cc
index ca24c2824ff..02d7614b61f 100644
--- a/core/src/dird/ua_status.cc
+++ b/core/src/dird/ua_status.cc
@@ -45,6 +45,7 @@
 #include "dird/ua_output.h"
 #include "dird/ua_select.h"
 #include "dird/ua_status.h"
+#include "include/auth_protocol_types.h"
 #include "lib/edit.h"
 #include "lib/recent_job_results_list.h"
 #include "lib/parse_conf.h"
diff --git a/core/src/include/auth_protocol_types.h b/core/src/include/auth_protocol_types.h
new file mode 100644
index 00000000000..568d9d976fe
--- /dev/null
+++ b/core/src/include/auth_protocol_types.h
@@ -0,0 +1,35 @@
+/*
+   BAREOS® - Backup Archiving REcovery Open Sourced
+
+   Copyright (C) 2000-2012 Free Software Foundation Europe e.V.
+   Copyright (C) 2011-2012 Planets Communications B.V.
+   Copyright (C) 2013-2019 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_SRC_INCLUDE_AUTH_PROTOCOL_TYPES_H_
+#define BAREOS_SRC_INCLUDE_AUTH_PROTOCOL_TYPES_H_
+
+enum AuthenticationProtocolType
+{
+  APT_NATIVE = 0,
+  APT_NDMPV2,
+  APT_NDMPV3,
+  APT_NDMPV4
+};
+
+#endif  // BAREOS_SRC_INCLUDE_AUTH_PROTOCOL_TYPES_H_
diff --git a/core/src/include/jcr.h b/core/src/include/jcr.h
index c0764dabec3..f828b4edc3c 100644
--- a/core/src/include/jcr.h
+++ b/core/src/include/jcr.h
@@ -51,17 +51,6 @@ typedef struct s_tree_root TREE_ROOT;
 
 class dlist;
 
-/**
- * Authentication Protocol types
- */
-enum
-{
-  APT_NATIVE = 0,
-  APT_NDMPV2,
-  APT_NDMPV3,
-  APT_NDMPV4
-};
-
 /**
  * Authentication types
  */