Merge pull request #1013

NDMP_BAREOS: support autoxflate plugin
bareos · Feb 24, 2022 · 16da019 · 16da019
2 parents 930ad1a + b8b4a4d
commit 16da019
Show file tree

Hide file tree

Showing 10 changed files with 200 additions and 284 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 ### Breaking Changes
 
 ### Fixed
+- NDMP_BAREOS: support autoxflate plugin [PR #1013]
 - debian: Let dbconfig create the Bareos catalog also with LC_COLLATE='C' and LC_CTYPE='C'. The create_bareos_database script did always do so. Requires dbconfig >= 2.0.21 [PR #1031]
 - fix wrong `packages_dir` in restapi workflow, so restapi packages will be released to PyPI [PR #1033]
 - core cats: Add IF EXISTS in drop table statements fix for bug #1409 (Allow usage of ExitOnFatal) [PR #1035]

diff --git a/core/src/console/console.cc b/core/src/console/console.cc
@@ -3,7 +3,7 @@
 
    Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
    Copyright (C) 2011-2012 Planets Communications B.V.
-   Copyright (C) 2013-2021 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2022 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
@@ -345,7 +345,7 @@ static char* get_first_keyword()
  */
 static char* get_previous_keyword(int current_point, int nb)
 {
-  int i, end = -1, start, inquotes = 0;
+  int i, end = -1, start = 0, inquotes = 0;
   char* s = NULL;
 
   while (nb-- >= 0) {

diff --git a/core/src/lib/compression.cc b/core/src/lib/compression.cc
@@ -3,7 +3,7 @@
 
    Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
    Copyright (C) 2011-2012 Planets Communications B.V.
-   Copyright (C) 2013-2019 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2021 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
@@ -471,10 +471,8 @@ static bool decompress_with_zlib(JobControlRecord* jcr,
     compress_len = jcr->compress.inflate_buffer_size;
   }
 
-  /*
-   * See if this is a compressed stream with the new compression header or an
-   * old one.
-   */
+  // See if this is a compressed stream with the new compression header or an
+  // old one.
   if (with_header) {
     cbuf = (const unsigned char*)*data + sizeof(comp_stream_header);
     real_compress_len = *length - sizeof(comp_stream_header);