Create archivedir

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

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index 43d98cf9c07adf69962eae88f13000f49be66ba7..f098c96ee51a7265debb06267ef9c01b95dd7ee4 100644 (file)
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -46,22 +46,6 @@ static bool crypto_session_start(JCR *jcr);
 static void crypto_session_end(JCR *jcr);
 static bool crypto_session_send(JCR *jcr, BSOCK *sd);
 
-/*
- * check for BSD nodump flag
- */
-static bool no_dump(JCR *jcr, FF_PKT *ff_pkt)
-{
-#if defined(HAVE_CHFLAGS) && defined(UF_NODUMP)
-   if ( (ff_pkt->flags & FO_HONOR_NODUMP) &&
-        (ff_pkt->statp.st_flags & UF_NODUMP) ) {
-      Jmsg(jcr, M_INFO, 1, _("     NODUMP flag set - will not process %s\n"),
-           ff_pkt->fname);
-      return true;                    /* do not backup this file */
-   }
-#endif
-   return false;                      /* do backup */
-}
-
 /*
  * Find all the requested files and send them
  * to the Storage daemon.
@@ -305,14 +289,10 @@ int save_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level)
       break;
    case FT_REGE:
       Dmsg1(130, "FT_REGE saving: %s\n", ff_pkt->fname);
-      if (no_dump(jcr, ff_pkt))
-          return 1;
       has_file_data = true;
       break;
    case FT_REG:
       Dmsg1(130, "FT_REG saving: %s\n", ff_pkt->fname);
-      if (no_dump(jcr, ff_pkt))
-          return 1;
       has_file_data = true;
       break;
    case FT_LNK:
@@ -320,8 +300,6 @@ int save_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level)
       break;
    case FT_DIRBEGIN:
       jcr->num_files_examined--;      /* correct file count */
-      if (no_dump(jcr, ff_pkt))       /* disable recursion on nodump directories */
-          ff_pkt->flags |= FO_NO_RECURSION;
       return 1;                       /* not used */
    case FT_NORECURSE:
       Jmsg(jcr, M_INFO, 1, _("     Recursion turned off. Will not descend from %s into %s\n"),
@@ -602,19 +580,23 @@ int save_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level)
 #endif
 
    /*
-    * Save ACLs for anything not being a symlink.
+    * Save ACLs for anything not being a symlink and not being a plugin.
     */
-   if (ff_pkt->flags & FO_ACL && ff_pkt->type != FT_LNK) {
-      if (!build_acl_streams(jcr, ff_pkt))
-         goto bail_out;
+   if (!ff_pkt->cmd_plugin) {
+      if (ff_pkt->flags & FO_ACL && ff_pkt->type != FT_LNK) {
+         if (!build_acl_streams(jcr, ff_pkt))
+            goto bail_out;
+      }
    }
 
    /*
-    * Save Extended Attributes for all files.
+    * Save Extended Attributes for all files not being a plugin.
     */
-   if (ff_pkt->flags & FO_XATTR) {
-      if (!build_xattr_streams(jcr, ff_pkt))
-         goto bail_out;
+   if (!ff_pkt->cmd_plugin) {
+      if (ff_pkt->flags & FO_XATTR) {
+         if (!build_xattr_streams(jcr, ff_pkt))
+            goto bail_out;
+      }
    }
 
    /* Terminate the signing digest and send it to the Storage daemon */