Merge branch 'master' into basejobv3

[bacula/bacula] / bacula / src / cats / cats.h

diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h
index 4613b67b5c0f05e8367928052b8e02b17dad6d4e..2c264d6a106ff9b450220547bba87515e60c31e3 100644 (file)
--- a/bacula/src/cats/cats.h
+++ b/bacula/src/cats/cats.h
@@ -866,6 +866,7 @@ struct ATTR_DBR {
    char *attr;                        /* attributes statp */
    uint32_t FileIndex;
    uint32_t Stream;
+   uint32_t FileType;
    JobId_t  JobId;
    DBId_t ClientId;
    DBId_t PathId;
@@ -1044,7 +1045,9 @@ struct db_int64_ctx {
    int count;                         /* number of values seen */
 };
 
-/* Call back context for getting a list of comma separated strings from the database */
+/* Call back context for getting a list of comma separated strings from the
+ * database 
+ */
 class db_list_ctx {
 public:
    POOLMEM *list;                     /* list */
@@ -1052,6 +1055,10 @@ public:
 
    db_list_ctx() { list = get_pool_memory(PM_FNAME); *list = 0; count = 0; }
    ~db_list_ctx() { free_pool_memory(list); list = NULL; }
+
+private:
+   db_list_ctx(const db_list_ctx&);            /* prohibit pass by value */
+   db_list_ctx &operator=(const db_list_ctx&); /* prohibit class assignment */
 };