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

diff --cc bacula/src/cats/bvfs.c
Simple merge

diff --cc bacula/src/cats/bvfs.h
index 72575abaf61c207ce0137b9cc9fec88d2ffcf949,69a4a916dc4ebed1b395b766245ccabc1289c9a6..8eb06c689cf41947074ff335eb455917ecdc102f
--- 1/bacula/src/cats/bvfs.h
--- 2/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 1d0512d983f83060528180b33e3561a7495cbdbc,2c143b0ad7b2fa172c40997380d6ee3157bb5534..9a932f09b0653ccd6740c408cd132c1afcd55cbe
--- 1/bacula/technotes
--- 2/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