Commit 1c14eb6c authored by Sven Hartge's avatar Sven Hartge

Cherry pick 25164d42d from Upstream, making EndBlock unsigned

parent 007d3fbb
......@@ -7,6 +7,8 @@ bacula (9.4.1-2) UNRELEASED; urgency=medium
* Switch to dh12, now that it is marked as stable
* Remove build-dependency libssl1.0-dev, package has been removed
from Debian (Closes: #917340)
* Cherry pick 25164d42d from upstream, making EndBlock unsigned to
avoid errors on very large volumes
-- Sven Hartge <sven@svenhartge.de> Fri, 28 Dec 2018 17:44:14 +0100
......
......@@ -6,6 +6,7 @@ upstream/relative-dirs-for-reproduceability
upstream/fix-spelling
upstream/fix-pkg-config-autoconf-macro
upstream/add-libs3-checks
upstream/fix-endblock-signedness-to-unsigned
debian/fix-default-config
debian/fix-default-dbtype
debian/fix-sql-bindir
......
commit 25164d42dbb8a238608dcc72c9c2ef99b73b2080
Author: Kern Sibbald <kern@sibbald.com>
Date: Mon Dec 31 20:34:35 2018 +0100
Change endblock edit to unsigned -- suggested by Martin Simmons
diff --git a/bacula/src/cats/sql_update.c b/bacula/src/cats/sql_update.c
index 7a8bb4ee0..b01ed7ad8 100644
--- a/bacula/src/cats/sql_update.c
+++ b/bacula/src/cats/sql_update.c
@@ -375,7 +375,7 @@ int BDB::bdb_update_media_record(JCR *jcr, MEDIA_DBR *mr)
"LabelType=%d,StorageId=%s,PoolId=%s,VolRetention=%s,VolUseDuration=%s,"
"MaxVolJobs=%d,MaxVolFiles=%d,Enabled=%d,LocationId=%s,"
"ScratchPoolId=%s,RecyclePoolId=%s,RecycleCount=%d,Recycle=%d,"
- "ActionOnPurge=%d,CacheRetention=%s,EndBlock=%d"
+ "ActionOnPurge=%d,CacheRetention=%s,EndBlock=%u"
" WHERE VolumeName='%s'",
mr->VolJobs, mr->VolFiles, mr->VolBlocks,
edit_uint64(mr->VolBytes, ed1),
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment