From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 30 Aug 2009 20:54:05 +0000 (+0200)
Subject: Merge branch 'master' of ssh://bacula.git.sourceforge.net/gitroot/bacula/bacula
X-Git-Tag: Release-5.0.0~325^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f1810901d8f179b90b31964664e73ae5f983d513;p=bacula%2Fbacula

Merge branch 'master' of ssh://bacula.git.sourceforge.net/gitroot/bacula/bacula
---

f1810901d8f179b90b31964664e73ae5f983d513
diff --cc bacula/src/cats/bvfs.h
index 72575abaf6,69a4a916dc..8eb06c689c
--- a/bacula/src/cats/bvfs.h
+++ b/bacula/src/cats/bvfs.h
@@@ -151,10 -151,13 +151,13 @@@ public
     /* for internal use */
     int _handle_path(void *, int, char **);
     
- private:   
+ private:
+    Bvfs(const Bvfs &);               /* prohibit pass by value */
+    Bvfs & operator = (const Bvfs &); /* prohibit class assignment */
+ 
     JCR *jcr;
     B_DB *db;
 -   POOLMEM *jobids;
 +   db_list_ctx jobids;
     uint32_t limit;
     uint32_t offset;
     uint32_t nb_record;          /* number of records of the last query */
diff --cc bacula/technotes
index 1d0512d983,2c143b0ad7..9a932f09b0
--- a/bacula/technotes
+++ b/bacula/technotes
@@@ -3,7 -3,7 +3,8 @@@
  General:
  
  30Aug09
 +kes  Fix bug #1355 Director crashes with double free in Accurate SQL query
+ ebl  Prohibe copy and assignment in Bvfs.
  28Aug09
  kes  Fix bug #1357 Verify jobs fail when job has zero files
  26Aug09