diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 95ec5ccc3a7..df8c0282229 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -155,7 +155,7 @@ set(BUILDNAME
     CACHE STRING "site name variable for CDash"
 )
 set(SITE
-  "${CMAKE_SYSTEM_NAME}-${DISTVER}-${CMAKE_HOST_SYSTEM_PROCESSOR}"
+    "${CMAKE_SYSTEM_NAME}-${DISTVER}-${CMAKE_HOST_SYSTEM_PROCESSOR}"
     CACHE STRING "build name variable for CDash"
 )
 # enable "make test"
@@ -337,7 +337,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "AIX")
 endif()
 include(BareosFindStaticCodeAnalysisTools)
 
-
 include(BareosGenerateDebianInfo)
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
   add_definitions(
@@ -585,7 +584,6 @@ message(STATUS "CMAKE_RANLIB: " ${CMAKE_RANLIB})
 
 message(STATUS "CMAKE_INSTALL_PREFIX:         " ${CMAKE_INSTALL_PREFIX})
 
-
 if(HAVE_DYNAMIC_SD_BACKENDS)
   set(UNCOMMENT_SD_BACKEND_DIRECTORY "")
 else()
diff --git a/core/platforms/debian/CMakeLists.txt b/core/platforms/debian/CMakeLists.txt
index 2cbcfb1a5b7..7d2aa19704d 100644
--- a/core/platforms/debian/CMakeLists.txt
+++ b/core/platforms/debian/CMakeLists.txt
@@ -82,9 +82,10 @@ file(GLOB SQLFILES
 )
 foreach(SQLFILE ${SQLFILES})
   get_filename_component(BASENAME ${SQLFILE} NAME)
-  string(
-    REGEX MATCH "[0-9]*_([0-9]*)" DUMMMY ${SQLFILE}
-  ) # match the regex, we only are interested in submatch in parentheses
+  string(REGEX MATCH "[0-9]*_([0-9]*)" DUMMMY ${SQLFILE}) # match the regex, we
+                                                          # only are interested
+                                                          # in submatch in
+                                                          # parentheses
   set(VERSION ${CMAKE_MATCH_1})
   install(
     FILES ${SQLFILE}
@@ -128,9 +129,10 @@ file(GLOB SQLFILES
 )
 foreach(SQLFILE ${SQLFILES})
   get_filename_component(BASENAME ${SQLFILE} NAME)
-  string(
-    REGEX MATCH "[0-9]*_([0-9]*)" DUMMMY ${SQLFILE}
-  ) # match the regex, we only are interested in submatch in parentheses
+  string(REGEX MATCH "[0-9]*_([0-9]*)" DUMMMY ${SQLFILE}) # match the regex, we
+                                                          # only are interested
+                                                          # in submatch in
+                                                          # parentheses
   set(VERSION ${CMAKE_MATCH_1})
 
   file(STRINGS ${SQLFILE} SQLFILE_LINE)
@@ -177,9 +179,10 @@ file(GLOB SQLFILES
 )
 foreach(SQLFILE ${SQLFILES})
   get_filename_component(BASENAME ${SQLFILE} NAME)
-  string(
-    REGEX MATCH "[0-9]*_([0-9]*)" DUMMMY ${SQLFILE}
-  ) # match the regex, we only are interested in submatch in parentheses
+  string(REGEX MATCH "[0-9]*_([0-9]*)" DUMMMY ${SQLFILE}) # match the regex, we
+                                                          # only are interested
+                                                          # in submatch in
+                                                          # parentheses
   set(VERSION ${CMAKE_MATCH_1})
   install(
     FILES ${SQLFILE}
diff --git a/core/platforms/univention/CMakeLists.txt b/core/platforms/univention/CMakeLists.txt
index eac483990ae..eb78e182f46 100644
--- a/core/platforms/univention/CMakeLists.txt
+++ b/core/platforms/univention/CMakeLists.txt
@@ -59,8 +59,9 @@ install(
 install(
   # This file contains the Bareos repository signature public.
   # During the automatic build process, It will be added.
-  # For manual builds, download the file from 
-  # http://download.bareos.org/bareos/release/<RELEASE>/<DISTRIBUTION>/Release.key
+  # For manual builds, download the file from
+  # http://download.bareos.org/bareos/release/<RELEASE>/<DISTRIBUTION>/Release.k
+  # ey
   FILES "bareos-release.key"
   DESTINATION "${confdir}"
 )
diff --git a/core/src/CMakeLists.txt b/core/src/CMakeLists.txt
index af73afffeb8..77e178c4d49 100644
--- a/core/src/CMakeLists.txt
+++ b/core/src/CMakeLists.txt
@@ -31,7 +31,7 @@ if(GTEST_FOUND)
   add_subdirectory(tests)
 endif()
 
-  add_subdirectory(console)
+add_subdirectory(console)
 if(${HAVE_LMDB})
   add_subdirectory(lmdb)
 endif()
diff --git a/core/src/cats/CMakeLists.txt b/core/src/cats/CMakeLists.txt
index 54599ba23e7..f2ca6c18729 100644
--- a/core/src/cats/CMakeLists.txt
+++ b/core/src/cats/CMakeLists.txt
@@ -45,8 +45,9 @@ set(POSTGRESQL_SRCS postgresql.cc ${LIBBAREOSCATS_SRCS})
 add_library(bareossql SHARED ${LIBBAREOSSQL_SRCS})
 
 set_target_properties(
-  bareossql PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
-                       "${BAREOS_VERSION_MAJOR}"
+  bareossql
+  PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
+                                                 "${BAREOS_VERSION_MAJOR}"
 )
 target_link_libraries(bareossql bareoscats bareos)
 
@@ -60,8 +61,9 @@ list(LENGTH db_backends nr_db_backends)
 add_library(bareoscats SHARED ${LIBBAREOSCATS_SRCS})
 target_link_libraries(bareoscats bareos)
 set_target_properties(
-  bareoscats PROPERTIES VERSION ${BAREOS_NUMERIC_VERSION} SOVERSION
-                        "${BAREOS_VERSION_MAJOR}"
+  bareoscats
+  PROPERTIES VERSION ${BAREOS_NUMERIC_VERSION} SOVERSION
+                                               "${BAREOS_VERSION_MAJOR}"
 )
 install(TARGETS bareoscats DESTINATION ${libdir})
 
diff --git a/core/src/console/CMakeLists.txt b/core/src/console/CMakeLists.txt
index bf671842dc2..43bb680c20a 100644
--- a/core/src/console/CMakeLists.txt
+++ b/core/src/console/CMakeLists.txt
@@ -45,8 +45,16 @@ endif()
 
 target_link_libraries(bconsole ${CONSOLE_LINK_LIBRARIES})
 
-install(TARGETS bconsole DESTINATION "${bindir}" COMPONENT bconsole)
-install(TARGETS bconsole DESTINATION "${sbindir}" COMPONENT bconsole)
+install(
+  TARGETS bconsole
+  DESTINATION "${bindir}"
+  COMPONENT bconsole
+)
+install(
+  TARGETS bconsole
+  DESTINATION "${sbindir}"
+  COMPONENT bconsole
+)
 install(
   FILES bconsole.conf
   DESTINATION "${configtemplatedir}"
diff --git a/core/src/fastlz/CMakeLists.txt b/core/src/fastlz/CMakeLists.txt
index bd6196f1182..70e370f1f00 100644
--- a/core/src/fastlz/CMakeLists.txt
+++ b/core/src/fastlz/CMakeLists.txt
@@ -31,6 +31,7 @@ target_include_directories(
 target_compile_definitions(bareosfastlz PRIVATE "-DDLL_EXPORT")
 install(TARGETS bareosfastlz DESTINATION ${libdir})
 set_target_properties(
-  bareosfastlz PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
-                          "${BAREOS_VERSION_MAJOR}"
+  bareosfastlz
+  PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
+                                                 "${BAREOS_VERSION_MAJOR}"
 )
diff --git a/core/src/filed/CMakeLists.txt b/core/src/filed/CMakeLists.txt
index 4a8ce61a9ee..ea0775b74b1 100644
--- a/core/src/filed/CMakeLists.txt
+++ b/core/src/filed/CMakeLists.txt
@@ -89,7 +89,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   )
 endif()
 
-install(TARGETS bareos-fd DESTINATION "${sbindir}" COMPONENT filedaemon)
+install(
+  TARGETS bareos-fd
+  DESTINATION "${sbindir}"
+  COMPONENT filedaemon
+)
 
 install(CODE "set(PLUGINS \"${PLUGINS}\")" COMPONENT filedaemon)
 install(CODE "set(BACKENDS \"${BACKENDS}\")" COMPONENT filedaemon)
diff --git a/core/src/findlib/CMakeLists.txt b/core/src/findlib/CMakeLists.txt
index 901d6dc4044..4b71d94c2cc 100644
--- a/core/src/findlib/CMakeLists.txt
+++ b/core/src/findlib/CMakeLists.txt
@@ -44,11 +44,17 @@ add_library(bareosfind SHARED ${BAREOSFIND_SRCS})
 
 target_link_libraries(bareosfind bareos ${ACL_LIBS})
 
-install(TARGETS bareosfind DESTINATION ${libdir} COMPONENT filedaemon)
+install(
+  TARGETS bareosfind
+  DESTINATION ${libdir}
+  COMPONENT filedaemon
+)
 
 set_target_properties(
-  bareosfind PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
-                        "${BAREOS_VERSION_MAJOR}" DEFINE_SYMBOL "BUILDING_DLL"
+  bareosfind
+  PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}"
+             SOVERSION "${BAREOS_VERSION_MAJOR}"
+             DEFINE_SYMBOL "BUILDING_DLL"
 )
 if(HAVE_WIN32)
   set_target_properties(bareosfind PROPERTIES DEFINE_SYMBOL "BUILDING_DLL")
diff --git a/core/src/lib/CMakeLists.txt b/core/src/lib/CMakeLists.txt
index 1b166b518ea..c49c797ffc8 100644
--- a/core/src/lib/CMakeLists.txt
+++ b/core/src/lib/CMakeLists.txt
@@ -228,8 +228,9 @@ target_link_libraries(
 install(TARGETS bareos DESTINATION ${libdir})
 
 set_target_properties(
-  bareos PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
-                    "${BAREOS_VERSION_MAJOR}"
+  bareos
+  PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
+                                                 "${BAREOS_VERSION_MAJOR}"
 )
 
 if(HAVE_WIN32)
diff --git a/core/src/lmdb/CMakeLists.txt b/core/src/lmdb/CMakeLists.txt
index faa539736cd..38ae0badbb0 100644
--- a/core/src/lmdb/CMakeLists.txt
+++ b/core/src/lmdb/CMakeLists.txt
@@ -27,8 +27,9 @@ add_library(bareoslmdb SHARED mdb.c midl.c)
 set_property(TARGET bareoslmdb PROPERTY INCLUDE_DIRECTORIES "")
 
 set_target_properties(
-  bareoslmdb PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
-                        "${BAREOS_VERSION_MAJOR}"
+  bareoslmdb
+  PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
+                                                 "${BAREOS_VERSION_MAJOR}"
 )
 if(HAVE_WIN32)
   set_target_properties(bareoslmdb PROPERTIES DEFINE_SYMBOL "BUILDING_DLL")
diff --git a/core/src/ndmp/CMakeLists.txt b/core/src/ndmp/CMakeLists.txt
index 9198f4f3288..dfbf768ad6f 100644
--- a/core/src/ndmp/CMakeLists.txt
+++ b/core/src/ndmp/CMakeLists.txt
@@ -187,8 +187,9 @@ target_link_libraries(bareosndmp ${WRAP_LIBS} ${TIRPC_LIBRARIES})
 install(TARGETS bareosndmp DESTINATION ${libdir})
 
 set_target_properties(
-  bareosndmp PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
-                        "${BAREOS_VERSION_MAJOR}"
+  bareosndmp
+  PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
+                                                 "${BAREOS_VERSION_MAJOR}"
 )
 if(build_ndmjob)
   add_executable(ndmjob ${NDMJOB_SRCS})
diff --git a/core/src/plugins/filed/CMakeLists.txt b/core/src/plugins/filed/CMakeLists.txt
index 51dc1f836c5..f7eb6e89be0 100644
--- a/core/src/plugins/filed/CMakeLists.txt
+++ b/core/src/plugins/filed/CMakeLists.txt
@@ -46,7 +46,11 @@ include_directories(${OPENSSL_INCLUDE_DIR})
 
 add_library(bpipe-fd MODULE bpipe-fd.cc)
 set_target_properties(bpipe-fd PROPERTIES PREFIX "")
-install(TARGETS bpipe-fd DESTINATION ${plugindir} COMPONENT filedaemon)
+install(
+  TARGETS bpipe-fd
+  DESTINATION ${plugindir}
+  COMPONENT filedaemon
+)
 if(HAVE_WIN32 OR HAVE_DARWIN_OS)
   target_link_libraries(bpipe-fd bareos)
 endif()
@@ -58,20 +62,32 @@ if(HAVE_WIN32)
     mssqlvdi-fd PROPERTIES PREFIX "" DEFINE_SYMBOL "BUILDING_DLL"
   )
 
-  install(TARGETS mssqlvdi-fd DESTINATION ${plugindir} COMPONENT filedaemon)
+  install(
+    TARGETS mssqlvdi-fd
+    DESTINATION ${plugindir}
+    COMPONENT filedaemon
+  )
   target_link_libraries(mssqlvdi-fd bareos)
 endif()
 
 if(${HAVE_CEPHFS})
   add_library(cephfs-fd MODULE cephfs-fd.cc)
   set_target_properties(cephfs-fd PROPERTIES PREFIX "")
-  install(TARGETS cephfs-fd DESTINATION ${plugindir} COMPONENT filedaemon)
+  install(
+    TARGETS cephfs-fd
+    DESTINATION ${plugindir}
+    COMPONENT filedaemon
+  )
 endif()
 
 if(${HAVE_CEPH_RADOS})
   add_library(rados-fd MODULE rados-fd.cc)
   set_target_properties(rados-fd PROPERTIES PREFIX "")
-  install(TARGETS rados-fd DESTINATION ${plugindir} COMPONENT filedaemon)
+  install(
+    TARGETS rados-fd
+    DESTINATION ${plugindir}
+    COMPONENT filedaemon
+  )
 endif()
 
 if(NOT HAVE_WIN32)
@@ -82,14 +98,22 @@ endif()
 if(HAVE_PYTHON)
   add_library(python-fd MODULE python-fd.cc)
   set_target_properties(python-fd PROPERTIES PREFIX "")
-  install(TARGETS python-fd DESTINATION ${plugindir} COMPONENT filedaemon)
+  install(
+    TARGETS python-fd
+    DESTINATION ${plugindir}
+    COMPONENT filedaemon
+  )
   target_link_libraries(python-fd ${PYTHON_LIBRARIES} bareos)
 endif()
 
 if(${HAVE_GLUSTERFS})
   add_library(gfapi-fd MODULE gfapi-fd.cc)
   set_target_properties(gfapi-fd PROPERTIES PREFIX "")
-  install(TARGETS gfapi-fd DESTINATION ${plugindir} COMPONENT filedaemon)
+  install(
+    TARGETS gfapi-fd
+    DESTINATION ${plugindir}
+    COMPONENT filedaemon
+  )
   target_link_libraries(gfapi-fd gfapi)
 endif()
 
@@ -97,7 +121,11 @@ if(${HAVE_TEST_PLUGIN})
   add_library(test-plugin-fd MODULE test-plugin-fd.cc)
   # do not prefix with "lib"
   set_target_properties(test-plugin-fd PROPERTIES PREFIX "")
-  install(TARGETS test-plugin-fd DESTINATION ${plugindir} COMPONENT filedaemon)
+  install(
+    TARGETS test-plugin-fd
+    DESTINATION ${plugindir}
+    COMPONENT filedaemon
+  )
 endif()
 
 set(PYFILES
diff --git a/core/src/stored/CMakeLists.txt b/core/src/stored/CMakeLists.txt
index 69eeddb1729..6ab95a9ee79 100644
--- a/core/src/stored/CMakeLists.txt
+++ b/core/src/stored/CMakeLists.txt
@@ -233,8 +233,8 @@ target_link_libraries(bcopy bareossd bareos)
 
 install(TARGETS bareossd DESTINATION ${libdir})
 
-install(TARGETS bareos-sd bls bextract bscan btape bcopy DESTINATION
-                "${sbindir}"
+install(TARGETS bareos-sd bls bextract bscan btape bcopy
+        DESTINATION "${sbindir}"
 )
 
 install(CODE "set(PLUGINS \"${PLUGINS}\")")
diff --git a/core/src/tests/CMakeLists.txt b/core/src/tests/CMakeLists.txt
index 7e47a12903f..2508069478e 100644
--- a/core/src/tests/CMakeLists.txt
+++ b/core/src/tests/CMakeLists.txt
@@ -29,7 +29,7 @@ macro(bareos_gtest_add_tests testname)
       ${found_tests} PROPERTIES ENVIRONMENT "WINEPATH=${WINEPATH}"
     )
   endif() # HAVE_WIN32
-endmacro()
+endmacro() # bareos_gtest_add_tests
 
 macro(bareos_add_test BAREOS_ADD_TEST_TESTNAME)
   set(options SKIP_GTEST)
@@ -51,7 +51,7 @@ macro(bareos_add_test BAREOS_ADD_TEST_TESTNAME)
   if(NOT BAREOS_ADD_TEST_SKIP_GTEST)
     bareos_gtest_add_tests(${BAREOS_ADD_TEST_TESTNAME})
   endif()
-endmacro()
+endmacro() # bareos_add_test
 
 include(GoogleTest)
 
@@ -68,27 +68,27 @@ if(HAVE_WIN32)
     comdlg32
     advapi32
   )
-endif()
+endif() # HAVE_WIN32
 
 if(HAVE_OPENSSL)
   set(SSL_UNIT_TEST_FILES init_openssl.cc)
 endif()
 
 set(LINK_LIBRARIES
-   stored_objects
-   dird_objects
-   console_objects
-   bareossd
-   bareos
-   bareoscats
-   bareossql
-   bareosfind
-   ${LMDB_LIBS}
-   ${NDMP_LIBS}
-   ${JANSSON_LIBRARIES}
-   ${GTEST_LIBRARIES}
-   ${GTEST_MAIN_LIBRARIES}
-   )
+    stored_objects
+    dird_objects
+    console_objects
+    bareossd
+    bareos
+    bareoscats
+    bareossql
+    bareosfind
+    ${LMDB_LIBS}
+    ${NDMP_LIBS}
+    ${JANSSON_LIBRARIES}
+    ${GTEST_LIBRARIES}
+    ${GTEST_MAIN_LIBRARIES}
+)
 
 if(HAVE_PAM)
   list(APPEND LINK_LIBRARIES ${PAM_LIBRARIES})
@@ -99,116 +99,131 @@ if(HAVE_WIN32)
   set(RELATIVE_PROJECT_SOURCE_DIR "Z:${CMAKE_CURRENT_SOURCE_DIR}")
   set(TEST_ORIGINAL_FILE_DIR
       Z:${CMAKE_CURRENT_SOURCE_DIR}/recent_job_results_list
-    )
+  )
   set(TEST_TEMP_DIR Z:${CMAKE_CURRENT_BINARY_DIR}/recent_job_results_list_tmp)
-  file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/recent_job_results_list_tmp)
+  file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/recent_job_results_list_tmp)
 
   set(CERTDIR Z:${CMAKE_CURRENT_SOURCE_DIR}/configs/test_bsock/tls)
-else()
+else() # NOT HAVE_WIN32
   file(RELATIVE_PATH RELATIVE_PROJECT_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}
        ${CMAKE_CURRENT_SOURCE_DIR}
-    )
+  )
   set(TEST_ORIGINAL_FILE_DIR
       ${CMAKE_CURRENT_SOURCE_DIR}/recent_job_results_list
-    )
+  )
   set(TEST_TEMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/recent_job_results_list_tmp)
-  file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/recent_job_results_list_tmp)
+  file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/recent_job_results_list_tmp)
 
   set(CERTDIR ${CMAKE_CURRENT_SOURCE_DIR}/configs/test_bsock/tls)
-endif()
+endif() # HAVE_WIN32
 
 add_definitions(
   -DRELATIVE_PROJECT_SOURCE_DIR=\"${RELATIVE_PROJECT_SOURCE_DIR}\"
 )
 
-if (NOT client-only)
-bareos_add_test(
-  run_on_incoming_connect_interval
-  LINK_LIBRARIES
-   dird_objects
-   bareos
-   bareosfind
-   bareoscats
-   bareossql
-   $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}>
-   ${LMDB_LIBS}
-   ${NDMP_LIBS}
-   ${GTEST_LIBRARIES}
-   ${GTEST_MAIN_LIBRARIES}
-)
-bareos_add_test(
-  scheduler
-  LINK_LIBRARIES
- dird_objects
- bareos
- bareosfind
- bareoscats
- bareossql
- $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}>
- ${LMDB_LIBS}
- ${NDMP_LIBS}
- ${GTEST_LIBRARIES}
- ${GTEST_MAIN_LIBRARIES}
-)
-endif()
-if (NOT client-only)
-bareos_add_test(
-  scheduler_job_item_queue
-  LINK_LIBRARIES dird_objects bareos ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
-)
-endif()
-bareos_add_test(
-  test_acl_entry_syntax LINK_LIBRARIES bareos ${GTEST_LIBRARIES}
-     ${GTEST_MAIN_LIBRARIES}
+if(NOT client-only)
+  bareos_add_test(
+    run_on_incoming_connect_interval
+    LINK_LIBRARIES
+      dird_objects
+      bareos
+      bareosfind
+      bareoscats
+      bareossql
+      $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}>
+      ${LMDB_LIBS}
+      ${NDMP_LIBS}
+      ${GTEST_LIBRARIES}
+      ${GTEST_MAIN_LIBRARIES}
   )
-if (NOT client-only)
+endif() # NOT client-only
+
+if(NOT client-only)
+  bareos_add_test(
+    scheduler
+    LINK_LIBRARIES
+      dird_objects
+      bareos
+      bareosfind
+      bareoscats
+      bareossql
+      $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}>
+      ${LMDB_LIBS}
+      ${NDMP_LIBS}
+      ${GTEST_LIBRARIES}
+      ${GTEST_MAIN_LIBRARIES}
+  )
+endif() # NOT client-only
+
+if(NOT client-only)
+  bareos_add_test(
+    scheduler_job_item_queue
+    LINK_LIBRARIES dird_objects bareos ${GTEST_LIBRARIES}
+                   ${GTEST_MAIN_LIBRARIES}
+  )
+endif() # NOT client-only
+
 bareos_add_test(
-  test_dir_plugins
-  ADDITIONAL_SOURCES ${PROJECT_SOURCE_DIR}/src/dird/dir_plugins.cc
-  LINK_LIBRARIES bareos bareoscats bareossql ${GTEST_LIBRARIES}
-   ${GTEST_MAIN_LIBRARIES}
+  test_acl_entry_syntax LINK_LIBRARIES bareos ${GTEST_LIBRARIES}
+                                       ${GTEST_MAIN_LIBRARIES}
 )
-endif()
+
+if(NOT client-only)
+  bareos_add_test(
+    test_dir_plugins
+    ADDITIONAL_SOURCES ${PROJECT_SOURCE_DIR}/src/dird/dir_plugins.cc
+    LINK_LIBRARIES bareos bareoscats bareossql ${GTEST_LIBRARIES}
+                   ${GTEST_MAIN_LIBRARIES}
+  )
+endif() # NOT client-only
+
 bareos_add_test(
   test_fd_plugins
   ADDITIONAL_SOURCES ${PROJECT_SOURCE_DIR}/src/filed/fd_plugins.cc
                      ${PROJECT_SOURCE_DIR}/src/filed/fileset.cc
   LINK_LIBRARIES bareos bareosfind ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
 )
+
 bareos_add_test(
   test_is_name_valid LINK_LIBRARIES bareos ${GTEST_LIBRARIES}
-   ${GTEST_MAIN_LIBRARIES}
+                                    ${GTEST_MAIN_LIBRARIES}
 )
+
 bareos_add_test(
   test_output_formatter
   LINK_LIBRARIES ${GTEST_MAIN_LIBRARIES} ${GTEST_LIBRARIES}
                  ${JANSSON_LIBRARIES} bareos
 )
+
 if(NOT client-only)
-bareos_add_test(
-  test_sd_plugins LINK_LIBRARIES bareos bareossd ${GTEST_LIBRARIES}
-   ${GTEST_MAIN_LIBRARIES}
-)
-endif()
+  bareos_add_test(
+    test_sd_plugins LINK_LIBRARIES bareos bareossd ${GTEST_LIBRARIES}
+                                   ${GTEST_MAIN_LIBRARIES}
+  )
+endif() # NOT client-only
+
 bareos_add_test(
   version_strings LINK_LIBRARIES bareos ${GTEST_LIBRARIES}
-   ${GTEST_MAIN_LIBRARIES}
+                                 ${GTEST_MAIN_LIBRARIES}
 )
 
 bareos_add_test(
   job_control_record LINK_LIBRARIES bareos ${GTEST_LIBRARIES}
-   ${GTEST_MAIN_LIBRARIES}
+                                    ${GTEST_MAIN_LIBRARIES}
 )
+
 if(NOT client-only)
-bareos_add_test(multiplied_device_test LINK_LIBRARIES ${LINK_LIBRARIES})
+  bareos_add_test(multiplied_device_test LINK_LIBRARIES ${LINK_LIBRARIES})
 endif()
+
 if(NOT client-only)
   bareos_add_test(
     ndmp_address_translate_test
     ADDITIONAL_SOURCES ../dird/ndmp_slot2elemaddr.cc
     LINK_LIBRARIES ${LINK_LIBRARIES}
   )
-endif()#client-only
+endif() # NOT client-only
+
 bareos_add_test(
   recent_job_results_list
   LINK_LIBRARIES bareos ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
@@ -217,81 +232,89 @@ bareos_add_test(
 )
 
 if(NOT client-only)
-bareos_add_test(
-  show_cmd_available_resources_equals_config_resources
-  LINK_LIBRARIES dird_objects bareos bareosfind bareoscats bareossql
-                 ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
-)
-endif()
+  bareos_add_test(
+    show_cmd_available_resources_equals_config_resources
+    LINK_LIBRARIES dird_objects bareos bareosfind bareoscats bareossql
+                   ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
+  )
+endif() # NOT client-only
+
 bareos_add_test(
   test_config_parser_console
   LINK_LIBRARIES console_objects bareos bareosfind ${GTEST_LIBRARIES}
-   ${GTEST_MAIN_LIBRARIES}
+                 ${GTEST_MAIN_LIBRARIES}
 )
 
 if(NOT client-only)
-bareos_add_test(
-  test_config_parser_dir
-  LINK_LIBRARIES dird_objects bareos bareosfind bareoscats bareossql
-                 ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
-)
-endif()
+  bareos_add_test(
+    test_config_parser_dir
+    LINK_LIBRARIES dird_objects bareos bareosfind bareoscats bareossql
+                   ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
+  )
+endif() # NOT client-only
+
 bareos_add_test(
   test_config_parser_fd
   LINK_LIBRARIES fd_objects bareos bareosfind ${GTEST_LIBRARIES}
-   ${GTEST_MAIN_LIBRARIES}
+                 ${GTEST_MAIN_LIBRARIES}
 )
+
 if(NOT client-only)
-bareos_add_test(
-  test_config_parser_sd
-  LINK_LIBRARIES stored_objects bareossd bareos ${GTEST_LIBRARIES}
-   ${GTEST_MAIN_LIBRARIES}
-)
-endif()
+  bareos_add_test(
+    test_config_parser_sd
+    LINK_LIBRARIES stored_objects bareossd bareos ${GTEST_LIBRARIES}
+                   ${GTEST_MAIN_LIBRARIES}
+  )
+endif() # NOT client-only
+
 bareos_add_test(
   test_crc32
   ADDITIONAL_SOURCES ../stored/crc32/crc32.cc
   LINK_LIBRARIES bareos ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
 )
+
 if(NOT client-only)
-bareos_add_test(
-  test_fileindex_list
-  LINK_LIBRARIES
-   dird_objects
-   bareos
-   bareosfind
-   bareoscats
-   bareossql
-    $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}>
-   ${LMDB_LIBS}
-   ${NDMP_LIBS}
-   ${GTEST_LIBRARIES}
-   ${GTEST_MAIN_LIBRARIES}
-)
-endif()
+  bareos_add_test(
+    test_fileindex_list
+    LINK_LIBRARIES
+      dird_objects
+      bareos
+      bareosfind
+      bareoscats
+      bareossql
+      $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}>
+      ${LMDB_LIBS}
+      ${NDMP_LIBS}
+      ${GTEST_LIBRARIES}
+      ${GTEST_MAIN_LIBRARIES}
+  )
+endif() # NOT client-only
+
 if(NOT client-only)
-bareos_add_test(
-  test_setdebug
-  LINK_LIBRARIES
-   dird_objects
-   bareos
-   bareosfind
-   bareoscats
-   bareossql
-    $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}>
-   ${LMDB_LIBS}
-   ${NDMP_LIBS}
-   ${GTEST_LIBRARIES}
-   ${GTEST_MAIN_LIBRARIES}
-)
-endif()
+  bareos_add_test(
+    test_setdebug
+    LINK_LIBRARIES
+      dird_objects
+      bareos
+      bareosfind
+      bareoscats
+      bareossql
+      $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}>
+      ${LMDB_LIBS}
+      ${NDMP_LIBS}
+      ${GTEST_LIBRARIES}
+      ${GTEST_MAIN_LIBRARIES}
+  )
+endif() # NOT client-only
+
 bareos_add_test(
   thread_list LINK_LIBRARIES bareos ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
 )
 bareos_add_test(
   thread_specific_data LINK_LIBRARIES bareos ${GTEST_LIBRARIES}
-   ${GTEST_MAIN_LIBRARIES}
+                                      ${GTEST_MAIN_LIBRARIES}
 )
+
 bareos_add_test(
   timer_thread LINK_LIBRARIES bareos ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
 )
@@ -319,9 +342,9 @@ if(HAVE_EXECINFO_H
 )
   bareos_add_test(
     test_backtrace LINK_LIBRARIES bareos ${GTEST_LIBRARIES}
-   ${GTEST_MAIN_LIBRARIES}
-)
-endif()
+                                  ${GTEST_MAIN_LIBRARIES}
+  )
+endif() # HAVE_EXECINFO_H ..
 
 if(GMOCK_FOUND AND NOT client-only)
   bareos_add_test(
@@ -330,21 +353,23 @@ if(GMOCK_FOUND AND NOT client-only)
 endif()
 
 if(NOT client-only)
-bareos_add_test(
-  lib_tests
-  ADDITIONAL_SOURCES
-    alist_test.cc bareos_test_sockets.cc dlist_test.cc htable_test.cc
-    qualified_resource_name_type_converter_test.cc
-    ${PROJECT_SOURCE_DIR}/src/filed/evaluate_job_command.cc
-  LINK_LIBRARIES stored_objects bareossd bareos ${JANSSON_LIBRARIES}
-                 ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
-)
-bareos_add_test(
-  bsock_test_connection_setup
-  ADDITIONAL_SOURCES ${SSL_UNIT_TEST_FILES}
-  LINK_LIBRARIES ${LINK_LIBRARIES}
-)
-endif()
+  bareos_add_test(
+    lib_tests
+    ADDITIONAL_SOURCES
+      alist_test.cc bareos_test_sockets.cc dlist_test.cc htable_test.cc
+      qualified_resource_name_type_converter_test.cc
+      ${PROJECT_SOURCE_DIR}/src/filed/evaluate_job_command.cc
+    LINK_LIBRARIES stored_objects bareossd bareos ${JANSSON_LIBRARIES}
+                   ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
+  )
+
+  bareos_add_test(
+    bsock_test_connection_setup
+    ADDITIONAL_SOURCES ${SSL_UNIT_TEST_FILES}
+    LINK_LIBRARIES ${LINK_LIBRARIES}
+  )
+endif() # NOT client-only
+
 if(NOT HAVE_WIN32 AND NOT client-only)
   bareos_add_test(
     test_bsock
@@ -357,6 +382,6 @@ if(NOT HAVE_WIN32 AND NOT client-only)
   )
   bareos_add_test(
     watchdog_timer LINK_LIBRARIES bareos ${GTEST_LIBRARIES}
-   ${GTEST_MAIN_LIBRARIES}
-)
-endif()
+                                  ${GTEST_MAIN_LIBRARIES}
+  )
+endif() # NOT HAVE_WIN32 AND NOT client-only
diff --git a/docs/manuals/CMakeLists.txt b/docs/manuals/CMakeLists.txt
index 0d4bbadd5c2..a4890855f2c 100644
--- a/docs/manuals/CMakeLists.txt
+++ b/docs/manuals/CMakeLists.txt
@@ -134,7 +134,8 @@ endif()
 
 # target: docs ######
 add_custom_target(
-  docs ${DOCS_ALL}
+  docs
+  ${DOCS_ALL}
   COMMAND ${SPHINX_COMMAND} -M html "${SPHINX_SOURCE_DIR}" "${SPHINX_BUILDDIR}"
           "${SPHINX_OPTS}"
   DEPENDS $<$<BOOL:${docs-build-json}>:clean-docs>
diff --git a/systemtests/CMakeLists.txt b/systemtests/CMakeLists.txt
index 4120b42e5ba..cffe92aabb6 100644
--- a/systemtests/CMakeLists.txt
+++ b/systemtests/CMakeLists.txt
@@ -20,13 +20,13 @@
 cmake_minimum_required(VERSION 3.3)
 project(bareos-systemtests)
 
-cmake_policy(SET CMP0057 NEW) #IF(.. IN_LIST ..)
+cmake_policy(SET CMP0057 NEW) # IF(.. IN_LIST ..)
 
 function(ConfigureFilesToSystemtest srcbasedir dirname globexpression
          configure_option srcdirname
 )
-  if (srcdirname STREQUAL "")
-    set(srcdirname "${dirname}" )
+  if(srcdirname STREQUAL "")
+    set(srcdirname "${dirname}")
   endif()
   set(count 1)
   file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${dirname})
@@ -39,7 +39,7 @@ function(ConfigureFilesToSystemtest srcbasedir dirname globexpression
     string(REGEX REPLACE ".in$" "" TARGET_FILE ${TARGET_FILE}) # do not mess
                                                                # with .ini files
     string(REPLACE "${srcbasedir}/${srcdirname}" "" TARGET_FILE ${TARGET_FILE})
-    #MESSAGE(STATUS "configuring  ${TARGET_FILE}" )
+    # MESSAGE(STATUS "configuring  ${TARGET_FILE}" )
     configure_file(
       ${CURRENT_FILE} ${PROJECT_BINARY_DIR}/${dirname}/${TARGET_FILE}
       ${configure_option}
@@ -83,28 +83,28 @@ macro(CheckForEnabledAndDisabledListEntry TEST_NAME_TO_CHECK)
   endif()
 endmacro()
 
-macro (handle_python_plugin_modules)
+macro(handle_python_plugin_modules)
   if(EXISTS ${python_plugin_module_src_test_dir})
     set(PYMODULES_TO_LINK_TO_SRC
-      filed/bareos-fd-local-fileset.py
-      filed/BareosFdPluginLocalFileset.py
-      filed/BareosFdWrapper.py
-      filed/BareosFdPluginLDAP.py
-      filed/bareos-fd-mock-test.py
-      filed/BareosFdPluginBaseclass.py
-      filed/bareos_fd_consts.py
-      filed/bareos-fd-ldap.py
-      dird/bareos_dir_consts.py
-      dird/BareosDirPluginBaseclass.py
-      dird/bareos-dir-class-plugin.py
-      dird/BareosDirWrapper.py
-      stored/bareos_sd_consts.py
-      stored/bareos-sd-class-plugin.py
-      stored/BareosSdPluginBaseclass.py
-      stored/BareosSdWrapper.py
+        filed/bareos-fd-local-fileset.py
+        filed/BareosFdPluginLocalFileset.py
+        filed/BareosFdWrapper.py
+        filed/BareosFdPluginLDAP.py
+        filed/bareos-fd-mock-test.py
+        filed/BareosFdPluginBaseclass.py
+        filed/bareos_fd_consts.py
+        filed/bareos-fd-ldap.py
+        dird/bareos_dir_consts.py
+        dird/BareosDirPluginBaseclass.py
+        dird/bareos-dir-class-plugin.py
+        dird/BareosDirWrapper.py
+        stored/bareos_sd_consts.py
+        stored/bareos-sd-class-plugin.py
+        stored/BareosSdPluginBaseclass.py
+        stored/BareosSdWrapper.py
     )
 
-    foreach (PYMODULE_SOURCEPATH ${PYMODULES_TO_LINK_TO_SRC})
+    foreach(PYMODULE_SOURCEPATH ${PYMODULES_TO_LINK_TO_SRC})
       get_filename_component(PYMODULE_NAME ${PYMODULE_SOURCEPATH} NAME)
       execute_process(
         COMMAND ${CMAKE_COMMAND} -E create_symlink
@@ -115,16 +115,16 @@ macro (handle_python_plugin_modules)
   endif()
 endmacro()
 
-macro (prepare_test)
+macro(prepare_test)
   # base directory for this test
   set(current_test_directory ${PROJECT_BINARY_DIR}/tests/${TEST_NAME})
   set(basename ${TEST_NAME})
 
-  #db parameters
+  # db parameters
   set(db_password "")
-  #db_name is regress-${TEST_NAME} replacing - by _
+  # db_name is regress-${TEST_NAME} replacing - by _
   string(REPLACE "-" "_" db_name "regress-${TEST_NAME}")
-  #set(db_name "regress-${TEST_NAME}")
+  # set(db_name "regress-${TEST_NAME}")
   set(db_user "regress")
 
   set(job_email root@localhost)
@@ -137,8 +137,8 @@ macro (prepare_test)
   set(sd_password sd_password)
 
   math(EXPR dir_port "${BASEPORT} + 0")
-  math(EXPR  fd_port "${BASEPORT} + 1")
-  math(EXPR  sd_port "${BASEPORT} + 2")
+  math(EXPR fd_port "${BASEPORT} + 1")
+  math(EXPR sd_port "${BASEPORT} + 2")
   math(EXPR sd2_port "${BASEPORT} + 3")
   math(EXPR php_port "${BASEPORT} + 4")
 
@@ -175,7 +175,7 @@ find_program(PHP php)
 # ${default_db_backend})
 message(STATUS "DEFAULT_DB_TYPE is ${DEFAULT_DB_TYPE}")
 
-#set(TAPEDRIVE "TAPEDRIVE")
+# set(TAPEDRIVE "TAPEDRIVE")
 
 set(archivedir "${PROJECT_BINARY_DIR}/archivedir")
 set(backenddir "${PROJECT_BINARY_DIR}/../core/src/cats")
@@ -184,7 +184,7 @@ set(bin ${PROJECT_BINARY_DIR}/bin)
 set(bindir ${PROJECT_BINARY_DIR}/bin)
 
 # set(conf ${PROJECT_BINARY_DIR}/defaultconfigs) set(confdir ${conf})
-#set(configs ${conf})
+# set(configs ${conf})
 
 set(BAREOS_CONFIG_DIR ${conf})
 set(db_name "regress")
@@ -209,10 +209,10 @@ set(plugindirtmp ${PROJECT_BINARY_DIR}/plugindirtmp)
 set(rscripts ${PROJECT_BINARY_DIR}/scripts)
 
 if(TARGET python-dir)
-    get_target_property(dir_plugin_binary_path python-dir BINARY_DIR)
+  get_target_property(dir_plugin_binary_path python-dir BINARY_DIR)
 endif()
 if(TARGET python-sd)
-    get_target_property(sd_plugin_binary_path python-sd BINARY_DIR)
+  get_target_property(sd_plugin_binary_path python-sd BINARY_DIR)
 endif()
 if(TARGET python-fd)
   get_target_property(fd_plugin_binary_path python-fd BINARY_DIR)
@@ -236,7 +236,7 @@ set(working_dir ${PROJECT_BINARY_DIR}/working)
 set(piddir ${PROJECT_BINARY_DIR}/piddir)
 file(MAKE_DIRECTORY ${piddir})
 
-#set(BASEPORT ${dir_port})
+# set(BASEPORT ${dir_port})
 
 # for config-lib.sh: do not remove @DB___@ but replace them with the original
 set(DB_NAME @DB_NAME@)
@@ -293,17 +293,17 @@ endforeach()
 
 set(tests_dir ${PROJECT_BINARY_DIR}/tests)
 set(SYSTEM_TESTS
-  backup-bareos-test
-  backup-bareos-passive-test
-  catalog
-  multiplied-device-test
-  virtualfull
-  virtualfull-bscan
-  backup-bscan
-  copy-bscan
-  copy-remote-bscan
-  bconsole-status-client
-  scheduler-backup-test
+    backup-bareos-test
+    backup-bareos-passive-test
+    catalog
+    multiplied-device-test
+    virtualfull
+    virtualfull-bscan
+    backup-bscan
+    copy-bscan
+    copy-remote-bscan
+    bconsole-status-client
+    scheduler-backup-test
 )
 
 set(SYSTEM_TESTS_DISABLED # initialy empty
@@ -323,7 +323,7 @@ if(PAM_WRAPPER_LIBRARIES) # BareosFindLibrary(pam_wrapper)
       COMMAND
         "${CMAKE_SOURCE_DIR}/systemtests/tests/bconsole-pam/bin/check_pam_exec_available.sh"
       WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/systemtests/tests/bconsole-pam/"
-      RESULT_VARIABLE   PAM_EXEC_AVAILABLE_RC
+      RESULT_VARIABLE PAM_EXEC_AVAILABLE_RC
     )
     if(${PAM_EXEC_AVAILABLE_RC} EQUAL "0")
       set(PAM_EXEC_FOUND TRUE)
@@ -380,17 +380,17 @@ message(STATUS "PYTHON_SELENIUM_FOUND:        " ${PYTHON_SELENIUM_FOUND})
 message(STATUS "CHROMEDRIVER_FOUND:           " ${CHROMEDRIVER_FOUND})
 
 set(AVAILABLE_WEBUI_SELENIUM_TESTS
-  "admin-client_disabling"
-  "admin-rerun_job"
-  "admin-restore"
-  "admin-run_configured_job"
-  "admin-run_default_job"
-  "readonly-client_disabling"
-  "readonly-rerun_job"
-  "readonly-restore"
-  "readonly-run_configured_job"
-  "readonly-run_default_job"
-  )
+    "admin-client_disabling"
+    "admin-rerun_job"
+    "admin-restore"
+    "admin-run_configured_job"
+    "admin-run_default_job"
+    "readonly-client_disabling"
+    "readonly-rerun_job"
+    "readonly-restore"
+    "readonly-run_configured_job"
+    "readonly-run_default_job"
+)
 
 if(ENABLE_WEBUI_SELENIUM_TEST)
   set(WEBUI_SELENIUM_TESTS ${AVAILABLE_WEBUI_SELENIUM_TESTS})
@@ -438,7 +438,7 @@ if(ENABLE_WEBUI_SELENIUM_TEST)
     prepare_test()
     # split WEBUI_TEST_NAME into PROFILE and TESTNAME
     string(REPLACE "-" ";" SELENIUM_TESTCOMPONENTS ${TEST_NAME})
-    #"webui-admin-restore"
+    # "webui-admin-restore"
     list(GET SELENIUM_TESTCOMPONENTS 0 BAREOS_WEBUI_PROFILE)
     list(GET SELENIUM_TESTCOMPONENTS 1 BAREOS_WEBUI_TESTNAME)
 
@@ -494,19 +494,19 @@ endforeach()
 # create symlinks for the binaries
 
 set(BINARIES_TO_LINK_TO_SBIN
-  dird/bareos-dir
-  dird/bareos-dbcheck
-  filed/bareos-fd
-  stored/bareos-sd
-  stored/bcopy
-  stored/btape
-  stored/bextract
-  stored/bareos-sd
-  stored/bls
-  stored/bscan
-  )
+    dird/bareos-dir
+    dird/bareos-dbcheck
+    filed/bareos-fd
+    stored/bareos-sd
+    stored/bcopy
+    stored/btape
+    stored/bextract
+    stored/bareos-sd
+    stored/bls
+    stored/bscan
+)
 
-foreach (BINARY_SOURCEPATH ${BINARIES_TO_LINK_TO_SBIN})
+foreach(BINARY_SOURCEPATH ${BINARIES_TO_LINK_TO_SBIN})
   get_filename_component(BINARY_NAME ${BINARY_SOURCEPATH} NAME)
   execute_process(
     COMMAND ${CMAKE_COMMAND} -E create_symlink
@@ -516,20 +516,20 @@ foreach (BINARY_SOURCEPATH ${BINARIES_TO_LINK_TO_SBIN})
 endforeach()
 
 set(BINARIES_TO_LINK_TO_BIN
-  console/bconsole
-  tools/bsmtp
-  tools/timelimit
-  tools/bwild
-  tools/bpluginfo
-  tools/bsmtp
-  tools/bscrypto
-  tools/btestls
-  tools/drivetype
-  tools/fstype
-  tools/bregex
-  )
+    console/bconsole
+    tools/bsmtp
+    tools/timelimit
+    tools/bwild
+    tools/bpluginfo
+    tools/bsmtp
+    tools/bscrypto
+    tools/btestls
+    tools/drivetype
+    tools/fstype
+    tools/bregex
+)
 
-foreach (BINARY_SOURCEPATH ${BINARIES_TO_LINK_TO_BIN})
+foreach(BINARY_SOURCEPATH ${BINARIES_TO_LINK_TO_BIN})
   get_filename_component(BINARY_NAME ${BINARY_SOURCEPATH} NAME)
   execute_process(
     COMMAND ${CMAKE_COMMAND} -E create_symlink