Permit to get Where/RegexWhere from Plugin and give access to Accurate data

[bacula/bacula] / bacula / src / filed / backup.c

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index 7fd9bf70e37c794919c797316b65c05e28558a0e..60beddb80c8e233f3062f3e8ee3d0e0825f02545 100644 (file)
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -6,7 +6,7 @@
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or

-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public

    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 


@@ -15,7 +15,7 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 

-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License

    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.


@@ -353,8 +353,13 @@ int save_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level)
    case FT_NOFSCHG:
       /* Suppress message for /dev filesystems */
       if (!is_in_fileset(ff_pkt)) {
    case FT_NOFSCHG:
       /* Suppress message for /dev filesystems */
       if (!is_in_fileset(ff_pkt)) {

-         Jmsg(jcr, M_INFO, 1, _("     %s is a different filesystem. Will not descend from %s into %s\n"),
-              ff_pkt->fname, ff_pkt->top_fname, ff_pkt->fname);
+#ifdef HAVE_WIN32
+         Jmsg(jcr, M_INFO, 1, _("     %s is a junction point or a different filesystem. Will not descend from %s into it.\n"),
+              ff_pkt->fname, ff_pkt->top_fname);
+#else
+         Jmsg(jcr, M_INFO, 1, _("     %s is a different filesystem. Will not descend from %s into it.\n"),
+              ff_pkt->fname, ff_pkt->top_fname);
+#endif

       }
       ff_pkt->type = FT_DIREND;       /* Backup only the directory entry */
       break;
       }
       ff_pkt->type = FT_DIREND;       /* Backup only the directory entry */
       break;


@@ -1106,7 +1111,7 @@ bool encode_and_send_attributes(JCR *jcr, FF_PKT *ff_pkt, int &data_stream)
    BSOCK *sd = jcr->store_bsock;
    char attribs[MAXSTRING];
    char attribsExBuf[MAXSTRING];
    BSOCK *sd = jcr->store_bsock;
    char attribs[MAXSTRING];
    char attribsExBuf[MAXSTRING];

-   char *attribsEx;
+   char *attribsEx = NULL;

    int attr_stream;
    int comp_len;
    bool stat;
    int attr_stream;
    int comp_len;
    bool stat;


@@ -1194,6 +1199,7 @@ bool encode_and_send_attributes(JCR *jcr, FF_PKT *ff_pkt, int &data_stream)
       break;
    case FT_RESTORE_FIRST:
       comp_len = ff_pkt->object_len;
       break;
    case FT_RESTORE_FIRST:
       comp_len = ff_pkt->object_len;

+      ff_pkt->object_compression = 0;

       if (ff_pkt->object_len > 1000) {
          /* Big object, compress it */
          int stat;
       if (ff_pkt->object_len > 1000) {
          /* Big object, compress it */
          int stat;


@@ -1360,7 +1366,7 @@ static void close_vss_backup_session(JCR *jcr)
          }
       }
       WCHAR *metadata = g_pVSSClient->GetMetadata();
          }
       }
       WCHAR *metadata = g_pVSSClient->GetMetadata();

-      if (metatdata) {
+      if (metadata) {

          FF_PKT *ff_pkt = jcr->ff;
          ff_pkt->fname = "job";
          ff_pkt->type = FT_RESTORE_FIRST;
          FF_PKT *ff_pkt = jcr->ff;
          ff_pkt->fname = "job";
          ff_pkt->type = FT_RESTORE_FIRST;