From 1dff7391bdeb05a9ae4945812d19ba4821cbb1bb Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 7 Mar 2009 21:11:32 +0000
Subject: [PATCH] Prevent bls from printing binary data when a plugin stream   
   encountered. This fixes bug #1238

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8509 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/filed/fd_plugins.c | 2 +-
 bacula/src/filed/fd_plugins.h | 2 +-
 bacula/src/stored/bls.c       | 4 ++--
 bacula/src/version.h          | 4 ++--
 bacula/technotes-2.5          | 2 ++
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/bacula/src/filed/fd_plugins.c b/bacula/src/filed/fd_plugins.c
index 5f4084fee1..3b54d81cd4 100644
--- a/bacula/src/filed/fd_plugins.c
+++ b/bacula/src/filed/fd_plugins.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/filed/fd_plugins.h b/bacula/src/filed/fd_plugins.h
index 9072c94df6..42dc47d34b 100644
--- a/bacula/src/filed/fd_plugins.h
+++ b/bacula/src/filed/fd_plugins.h
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/stored/bls.c b/bacula/src/stored/bls.c
index b5b936b0ea..5f4117de69 100644
--- a/bacula/src/stored/bls.c
+++ b/bacula/src/stored/bls.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -407,7 +407,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
          num_files++;
       }
    } else if (rec->Stream == STREAM_PLUGIN_NAME) {
-      Pmsg1(000, "Plugin name: %s\n", rec->data);
+      Pmsg0(000, "Plugin stream\n");
    }
       
    return true;
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 8f2a36bd0a..eb5c4c2d2f 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.5.41"
-#define BDATE   "06 March 2009"
-#define LSMDATE "06Mar09"
+#define BDATE   "07 March 2009"
+#define LSMDATE "07Mar09"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2009 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2009"       /* year for copyright messages in progs */
diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 487c0ba4e5..fc11943e10 100644
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -26,6 +26,8 @@ mixed priorities
 
 General:
 07Mar09
+kes  Prevent bls from printing binary data when a plugin stream
+     encountered. This fixes bug #1238
 kes  Prepare to add JS_Warnings termination status.
 kes  Attempt to resolve bwx-console Win32 crash. Not likely to
      work.
-- 
2.39.5