This commit was manufactured by cvs2svn to create tag

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

diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h
index 25d5b53ea4b8e7d38067ca7865f7a21fcfb3f273..00097ccaed7f5ea5b31401ba8f30d40839f31072 100644 (file)
--- a/bacula/src/cats/cats.h
+++ b/bacula/src/cats/cats.h
@@ -14,7 +14,7 @@
  *    Version $Id$
  */
 /*
-   Copyright (C) 2000-2006 Kern Sibbald
+   Copyright (C) 2000-2005 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -546,8 +546,6 @@ struct JOB_DBR {
    uint32_t JobErrors;
    uint32_t JobMissingFiles;
    uint64_t JobBytes;
-   int PurgedFiles;
-   int HasBase;
 
    /* Note, FirstIndex, LastIndex, Start/End File and Block
     * are only used in the JobMedia record.
@@ -567,33 +565,6 @@ struct JOB_DBR {
    faddr_t rec_addr;
 };
 
-/* 
- * Suplementary record for Migration, archive, copy jobs
- */
-/* MAC record */
-struct MAC_DBR {
-   JobId_t JobId;                     /* Id of this job */
-   JobId_t OriginalJobId;             /* Id of job migrated, copied or archived */
-   /* 
-    * The following are the actual values for this job. This
-    *  is needed because the values in the corresponding Job
-    *  record were set to the values of the original backup job.
-    */
-   int JobType;                       /* Actual job type */
-   int JobLevel;                      /* Actual job level */
-   time_t SchedTime;                  /* Actual time job scheduled */
-   time_t StartTime;                  /* Actual Job start time */
-   time_t EndTime;                    /* Actual Job termination time */
-   utime_t JobTDate;                  /* Actual Backup time/date in seconds */
-
-   char cSchedTime[MAX_TIME_LENGTH];
-   char cStartTime[MAX_TIME_LENGTH];
-   char cEndTime[MAX_TIME_LENGTH];
-
-};
-
-
-
 /* Job Media information used to create the media records
  * for each Volume used for the job.
  */
@@ -617,7 +588,6 @@ struct JOBMEDIA_DBR {
 struct VOL_PARAMS {
    char VolumeName[MAX_NAME_LENGTH];  /* Volume name */
    char MediaType[MAX_NAME_LENGTH];   /* Media Type */
-   char Storage[MAX_NAME_LENGTH];     /* Storage name */
    uint32_t VolIndex;                 /* Volume seqence no. */
    uint32_t FirstIndex;               /* First index this Volume */
    uint32_t LastIndex;                /* Last index this Volume */
@@ -625,7 +595,6 @@ struct VOL_PARAMS {
    uint32_t EndFile;                  /* End file on Volume */
    uint32_t StartBlock;               /* start block on tape */
    uint32_t EndBlock;                 /* last block */
-   int32_t Slot;                      /* Slot */
 // uint32_t Copy;                     /* identical copy */
 // uint32_t Stripe;                   /* RAIT strip number */
 };
@@ -646,8 +615,8 @@ struct ATTR_DBR {
    DBId_t PathId;
    DBId_t FilenameId;
    FileId_t FileId;
-   char *Digest;
-   int DigestType;
+   char *Sig;
+   int SigType;
 };
 
 
@@ -660,8 +629,8 @@ struct FILE_DBR {
    DBId_t PathId;
    JobId_t  MarkId;
    char LStat[256];
-   char Digest[BASE64_SIZE(CRYPTO_DIGEST_MAX_SIZE)];
-   int DigestType;                    /* NO_SIG/MD5_SIG/SHA1_SIG */
+   char SIG[50];
+   int SigType;                       /* NO_SIG/MD5_SIG/SHA1_SIG */
 };
 
 /* Pool record -- same format as database */