aboutsummaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/bareos-server/Makefile2
-rw-r--r--sysutils/bareos-server/files/patch-src-stored-ndmp_tape.c19
2 files changed, 20 insertions, 1 deletions
diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index a6432dc1a89c..4cdd4b879e6d 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bareos
DISTVERSION= 15.2.2
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= sysutils
PKGNAMEPREFIX?= #
PKGNAMESUFFIX?= -server
diff --git a/sysutils/bareos-server/files/patch-src-stored-ndmp_tape.c b/sysutils/bareos-server/files/patch-src-stored-ndmp_tape.c
new file mode 100644
index 000000000000..58aefab00b47
--- /dev/null
+++ b/sysutils/bareos-server/files/patch-src-stored-ndmp_tape.c
@@ -0,0 +1,19 @@
+--- src/stored/ndmp_tape.c 2016-01-27 17:57:48.370956000 -0500
++++ src/stored/ndmp_tape.c 2016-01-27 17:59:50.890336000 -0500
+@@ -347,6 +347,16 @@
+ DCR *dcr = jcr->dcr;
+ POOLMEM *rec_data;
+
++ if (!dcr) {
++ Dmsg0(100, "No dcr defined, bailing out\n");
++ return retval;
++ }
++
++ if (!dcr->rec) {
++ Dmsg0(100, "No dcr->rec defined, bailing out\n");
++ return retval;
++ }
++
+ /*
+ * Keep track of the original data buffer and restore it on exit from this function.
+ */