From: Eric Bollengier Date: Mon, 20 Apr 2020 13:42:15 +0000 (+0200) Subject: BEE Backport bacula/src/filed/bacl.h X-Git-Tag: Release-11.3.2~1865 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c3324ef1c1e49273867671bef2fcdba847eec8f;p=thirdparty%2Fbacula.git BEE Backport bacula/src/filed/bacl.h This commit is the result of the squash of the following main commits: Author: Eric Bollengier Date: Fri Apr 17 18:33:43 2020 +0200 Update Bacula Systems Copyright Author: Eric Bollengier 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 9d367fdbd0..14b5717324 100644 --- 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 ();