From: Alain Spineux <alain@baculasystems.com>
Date: Thu, 3 Dec 2020 09:14:28 +0000 (+0100)
Subject: Fix #2582 bextract is broken for sparse gzip and compressed streams
X-Git-Tag: Release-9.6.7~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2f02291a74a4cd327662c35cdcead0f5b7ee0e1;p=thirdparty%2Fbacula.git

Fix #2582 bextract is broken for sparse gzip and compressed streams

- probably due to a "Due to a careless cut-n-paste"
- thanks to Grrr
---

diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c
index ef6071134..49edc3ee0 100644
--- a/bacula/src/stored/bextract.c
+++ b/bacula/src/stored/bextract.c
@@ -477,7 +477,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
          uLong compress_len = compress_buf_size;
          int stat = Z_BUF_ERROR;
 
-         if (rec->maskedStream == STREAM_SPARSE_DATA) {
+         if (rec->maskedStream == STREAM_SPARSE_GZIP_DATA) {
             ser_declare;
             uint64_t faddr;
             char ec1[50];
@@ -542,7 +542,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
          int r, real_compress_len;
 #endif
 
-         if (rec->maskedStream == STREAM_SPARSE_DATA) {
+         if (rec->maskedStream == STREAM_SPARSE_COMPRESSED_DATA) {
             ser_declare;
             uint64_t faddr;
             char ec1[50];