BEE Backport bacula/src/filed/bacl.h

This commit is the result of the squash of the following main commits:

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Fri Apr 17 18:33:43 2020 +0200

    Update Bacula Systems Copyright

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Tue Sep 24 13:39:41 2019 +0200

    Fix issue with xattr/acl detection code

diff --git a/bacula/src/filed/bacl.h b/bacula/src/filed/bacl.h
index 9d367fdbd0408c2b53e8d128d1d39205ebd6402f..14b5717324594a4583d7e70cfc640df6cd6913f4 100644 (file)
--- a/bacula/src/filed/bacl.h
+++ b/bacula/src/filed/bacl.h
@@ -78,9 +78,9 @@ typedef enum {
 /*
  * Basic ACL class which is a foundation for any other OS specific implementation.
  *
- * This class cannot be used directly as it is an abstraction class with a lot
- * of virtual methods laying around. As a basic class it has all public API
- * available for backup and restore functionality. As a bonus it handles all
+ * This class cannot be used directly as it is an abstraction class with a lot 
+ * of virtual methods laying around. As a basic class it has all public API 
+ * available for backup and restore functionality. As a bonus it handles all 
  * ACL generic functions and OS independent API, i.e. for AFS ACL or Plugins ACL
  * (future functionality).
  */
@@ -149,7 +149,7 @@ private:
 
    void inc_acl_errors(){ acl_nr_errors++;};
    bRC_BACL check_dev (JCR *jcr);
-   void check_dev (JCR *jcr, uint32_t dev);
+   void check_dev (JCR *jcr, FF_PKT *ff, uint32_t dev);
 
 public:
    BACL ();