return bacl_exit_ok;
#endif
- /**
+ /*
* Sanity check
*/
if (jcr->acl_data->content_length <= 0) {
return bacl_exit_ok;
}
- /**
+ /*
* Send header
*/
if (!sd->fsend("%ld %d 0", jcr->JobFiles, stream)) {
return bacl_exit_fatal;
}
- /**
+ /*
* Send the buffer to the storage deamon
*/
Dmsg1(400, "Backing up ACL <%s>\n", jcr->acl_data->content);
return bacl_exit_ok;
}
-/**
+/*
* First the native ACLs.
*/
#if defined(HAVE_ACL)
return (acl->aclEntryN > 0 ? false : true);
}
-/**
+/*
* Define the supported ACL streams for this OS
*/
static int os_access_acl_streams[3] = { STREAM_ACL_AIX_TEXT, STREAM_ACL_AIX_AIXC, STREAM_ACL_AIX_NFS4 };
bacl_exit_code retval = bacl_exit_error;
POOLMEM *aclbuf = get_pool_memory(PM_MESSAGE);
- /**
+ /*
* First see how big the buffers should be.
*/
type.u64 = ACL_ANY;
}
}
- /**
+ /*
* Make sure the buffers are big enough.
*/
aclbuf = check_pool_memory_size(aclbuf, aclsize + 1);
- /**
+ /*
* Retrieve the ACL info.
*/
if (aclx_get(jcr->last_fname, 0, &type, aclbuf, &aclsize, &mode) < 0) {
}
}
- /**
+ /*
* See if the acl is non trivial.
*/
switch (type.u64) {
goto bail_out;
}
- /**
+ /*
* We have a non-trivial acl lets convert it into some ASCII form.
*/
acltxtsize = sizeof_pool_memory(jcr->acl_data->content);
aclsize, type, jcr->last_fname, 0) < 0) {
switch (errno) {
case ENOSPC:
- /**
+ /*
* Our buffer is not big enough, acltxtsize should be updated with the value
* the aclx_printStr really need. So we increase the buffer and try again.
*/
switch (stream) {
case STREAM_ACL_AIX_TEXT:
- /**
+ /*
* Handle the old stream using the old system call for now.
*/
if (acl_put(jcr->last_fname, jcr->acl_data->content, 0) != 0) {
goto bail_out;
} /* end switch (stream) */
- /**
+ /*
* Set the acl buffer to an initial size. For now we set it
* to the same size as the ASCII representation.
*/
if (aclx_scanStr(jcr->acl_data->content, aclbuf, &aclsize, type) < 0) {
switch (errno) {
case ENOSPC:
- /**
+ /*
* The buffer isn't big enough. The man page doesn't say that aclsize
* is updated to the needed size as what is done with aclx_printStr.
* So for now we try to increase the buffer a maximum of 3 times
break;
}
- /**
+ /*
* See why we failed this time, ENOSPC retry if max retries not met,
* otherwise abort.
*/
#include <sys/access.h>
-/**
+/*
* Define the supported ACL streams for this OS
*/
static int os_access_acl_streams[1] = { STREAM_ACL_AIX_TEXT };
}
#endif /* HAVE_EXTENDED_ACL */
-/**
+/*
* For this OS setup the build and parse function pointer to the OS specific functions.
*/
static bacl_exit_code (*os_build_acl_streams)(JCR *jcr, FF_PKT *ff_pkt) = aix_build_acl_streams;
#error "configure failed to detect availability of sys/acl.h"
#endif
-/**
+/*
* On IRIX we can get shortened ACLs
*/
#if defined(HAVE_IRIX_OS) && defined(BACL_WANT_SHORT_ACLS)
#define acl_to_text(acl,len) acl_to_short_text((acl), (len))
#endif
-/**
+/*
* On Linux we can get numeric and/or shorted ACLs
*/
#if defined(HAVE_LINUX_OS)
#endif
#endif
-/**
+/*
* On FreeBSD we can get numeric ACLs
*/
#if defined(HAVE_FREEBSD_OS)
#endif
#endif
-/**
+/*
* Some generic functions used by multiple OSes.
*/
static acl_type_t bac_to_os_acltype(bacl_type acltype)
ostype = ACL_TYPE_DEFAULT;
break;
#ifdef HAVE_ACL_TYPE_NFS4
- /**
+ /*
* FreeBSD has an additional acl type named ACL_TYPE_NFS4.
*/
case BACL_TYPE_NFS4:
#endif
#ifdef HAVE_ACL_TYPE_DEFAULT_DIR
case BACL_TYPE_DEFAULT_DIR:
- /**
+ /*
* TRU64 has an additional acl type named ACL_TYPE_DEFAULT_DIR.
*/
ostype = ACL_TYPE_DEFAULT_DIR;
#endif
#ifdef HAVE_ACL_TYPE_EXTENDED
case BACL_TYPE_EXTENDED:
- /**
+ /*
* MacOSX has an additional acl type named ACL_TYPE_EXTENDED.
*/
ostype = ACL_TYPE_EXTENDED;
break;
#endif
default:
- /**
+ /*
* This should never happen, as the per OS version function only tries acl
* types supported on a certain platform.
*/
}
#if !defined(HAVE_DARWIN_OS)
-/**
+/*
* See if an acl is a trivial one (e.g. just the stat bits encoded as acl.)
* There is no need to store those acls as we already store the stat bits too.
*/
static bool acl_is_trivial(acl_t acl)
{
- /**
+ /*
* acl is trivial if it has only the following entries:
* "user::",
* "group::",
entry_available = acl_get_entry(acl, ACL_FIRST_ENTRY, &ace);
while (entry_available == 1) {
- /**
+ /*
* Get the tag type of this acl entry.
* If we fail to get the tagtype we call the acl non-trivial.
*/
if (acl_get_tag_type(ace, &tag) < 0)
return true;
- /**
+ /*
* Anything other the ACL_USER_OBJ, ACL_GROUP_OBJ or ACL_OTHER breaks the spell.
*/
if (tag != ACL_USER_OBJ &&
ace = &acl->acl_entry[n];
tag = ace->ae_tag;
- /**
+ /*
* Anything other the ACL_USER_OBJ, ACL_GROUP_OBJ or ACL_OTHER breaks the spell.
*/
if (tag != ACL_USER_OBJ &&
while (count > 0) {
tag = ace->entry->acl_type;
- /**
+ /*
* Anything other the ACL_USER_OBJ, ACL_GROUP_OBJ or ACL_OTHER breaks the spell.
*/
if (tag != ACL_USER_OBJ &&
tag != ACL_GROUP_OBJ &&
tag != ACL_OTHER)
return false;
- /**
+ /*
* On Tru64, perm can also contain non-standard bits such as
* PERM_INSERT, PERM_DELETE, PERM_MODIFY, PERM_LOOKUP, ...
*/
goto bail_out;
}
- /**
+ /*
* Make sure this is not just a trivial ACL.
*/
#if !defined(HAVE_DARWIN_OS)
if (acltype == BACL_TYPE_ACCESS && acl_is_trivial(acl)) {
- /**
+ /*
* The ACLs simply reflect the (already known) standard permissions
* So we don't send an ACL stream to the SD.
*/
int trivial;
if (acl_is_trivial_np(acl, &trivial) == 0) {
if (trivial == 1) {
- /**
+ /*
* The ACLs simply reflect the (already known) standard permissions
* So we don't send an ACL stream to the SD.
*/
}
#endif
- /**
+ /*
* Convert the internal acl representation into a text representation.
*/
if ((acl_text = acl_to_text(acl, NULL)) != NULL) {
retval = bacl_exit_error;
goto bail_out;
} else {
- /**
+ /*
* Handle errors gracefully.
*/
switch (errno) {
#if defined(BACL_ENOTSUP)
case BACL_ENOTSUP:
- /**
+ /*
* If the filesystem reports it doesn't support ACLs we clear the
* BACL_FLAG_SAVE_NATIVE flag so we skip ACL saves on all other files
* on the same filesystem. The BACL_FLAG_SAVE_NATIVE flag gets set again
acl_type_t ostype;
berrno be;
- /**
+ /*
* If we get empty default ACLs, clear ACLs now
*/
ostype = bac_to_os_acltype(acltype);
switch (errno) {
case ENOENT:
return bacl_exit_ok;
+#if defined(BACL_ENOTSUP)
+ case BACL_ENOTSUP:
+ /*
+ * If the filesystem reports it doesn't support ACLs we clear the
+ * BACL_FLAG_RESTORE_NATIVE flag so we skip ACL restores on all other files
+ * on the same filesystem. The BACL_FLAG_RESTORE_NATIVE flag gets set again
+ * when we change from one filesystem to an other.
+ */
+ jcr->acl_data->flags &= ~BACL_FLAG_RESTORE_NATIVE;
+ Mmsg1(jcr->errmsg, _("acl_delete_def_file error on file \"%s\": filesystem doesn't support ACLs\n"),
+ jcr->last_fname);
+ return bacl_exit_error;
+#endif
default:
Mmsg2(jcr->errmsg, _("acl_delete_def_file error on file \"%s\": ERR=%s\n"),
jcr->last_fname, be.bstrerror());
case ENOENT:
acl_free(acl);
return bacl_exit_ok;
+#if defined(BACL_ENOTSUP)
+ case BACL_ENOTSUP:
+ /*
+ * If the filesystem reports it doesn't support ACLs we clear the
+ * BACL_FLAG_RESTORE_NATIVE flag so we skip ACL restores on all other files
+ * on the same filesystem. The BACL_FLAG_RESTORE_NATIVE flag gets set again
+ * when we change from one filesystem to an other.
+ */
+ jcr->acl_data->flags &= ~BACL_FLAG_RESTORE_NATIVE;
+ Mmsg1(jcr->errmsg, _("acl_set_file error on file \"%s\": filesystem doesn't support ACLs\n"),
+ jcr->last_fname);
+ Dmsg2(100, "acl_set_file error acl=%s file=%s filesystem doesn't support ACLs\n",
+ jcr->acl_data->content, jcr->last_fname);
+ acl_free(acl);
+ return bacl_exit_error;
+#endif
default:
Mmsg2(jcr->errmsg, _("acl_set_file error on file \"%s\": ERR=%s\n"),
jcr->last_fname, be.bstrerror());
#endif
}
-/**
+/*
* For this OS setup the build and parse function pointer to the OS specific functions.
*/
static bacl_exit_code (*os_build_acl_streams)(JCR *jcr, FF_PKT *ff_pkt) = darwin_build_acl_streams;
static bacl_exit_code (*os_parse_acl_streams)(JCR *jcr, int stream) = darwin_parse_acl_streams;
#elif defined(HAVE_FREEBSD_OS)
-/**
+/*
* Define the supported ACL streams for these OSes
*/
static int os_access_acl_streams[2] = { STREAM_ACL_FREEBSD_ACCESS_ACL, STREAM_ACL_FREEBSD_NFS4_ACL };
berrno be;
#if defined(_PC_ACL_NFS4)
- /**
+ /*
* See if filesystem supports NFS4 acls.
*/
acl_enabled = pathconf(jcr->last_fname, _PC_ACL_NFS4);
#endif
if (acl_enabled == 0) {
- /**
+ /*
* See if filesystem supports POSIX acls.
*/
acl_enabled = pathconf(jcr->last_fname, _PC_ACL_EXTENDED);
}
}
- /**
+ /*
* If the filesystem reports it doesn't support ACLs we clear the
* BACL_FLAG_SAVE_NATIVE flag so we skip ACL saves on all other files
* on the same filesystem. The BACL_FLAG_SAVE_NATIVE flag gets set again
return bacl_exit_ok;
}
- /**
+ /*
* Based on the supported ACLs retrieve and store them.
*/
switch (acltype) {
case BACL_TYPE_NFS4:
- /**
+ /*
* Read NFS4 ACLs for files, dirs and links
*/
if (generic_get_acl_from_os(jcr, BACL_TYPE_NFS4) == bacl_exit_fatal)
}
break;
case BACL_TYPE_ACCESS:
- /**
+ /*
* Read access ACLs for files, dirs and links
*/
if (generic_get_acl_from_os(jcr, BACL_TYPE_ACCESS) == bacl_exit_fatal)
return bacl_exit_fatal;
}
- /**
+ /*
* Directories can have default ACLs too
*/
if (ff_pkt->type == FT_DIREND) {
const char *acl_type_name;
berrno be;
- /**
+ /*
* First make sure the filesystem supports acls.
*/
switch (stream) {
return bacl_exit_error;
}
case 0:
+ /*
+ * If the filesystem reports it doesn't support ACLs we clear the
+ * BACL_FLAG_RESTORE_NATIVE flag so we skip ACL restores on all other files
+ * on the same filesystem. The BACL_FLAG_RESTORE_NATIVE flag gets set again
+ * when we change from one filesystem to an other.
+ */
+ jcr->acl_data->flags &= ~BACL_FLAG_SAVE_NATIVE;
Mmsg2(jcr->errmsg, _("Trying to restore acl on file \"%s\" on filesystem without %s acl support\n"),
jcr->last_fname, acl_type_name);
return bacl_exit_error;
break;
}
- /**
+ /*
* Restore the ACLs.
*/
switch (stream) {
return bacl_exit_error;
}
-/**
+/*
* For this OSes setup the build and parse function pointer to the OS specific functions.
*/
static bacl_exit_code (*os_build_acl_streams)(JCR *jcr, FF_PKT *ff_pkt) = freebsd_build_acl_streams;
#elif defined(HAVE_IRIX_OS) || \
defined(HAVE_LINUX_OS)
-/**
+/*
* Define the supported ACL streams for these OSes
*/
#if defined(HAVE_IRIX_OS)
static bacl_exit_code generic_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
{
- /**
+ /*
* Read access ACLs for files, dirs and links
*/
if (generic_get_acl_from_os(jcr, BACL_TYPE_ACCESS) == bacl_exit_fatal)
return bacl_exit_fatal;
}
- /**
+ /*
* Directories can have default ACLs too
*/
if (ff_pkt->type == FT_DIREND) {
case STREAM_UNIX_DEFAULT_ACL:
return generic_set_acl_on_os(jcr, BACL_TYPE_DEFAULT);
default:
- /**
+ /*
* See what type of acl it is.
*/
for (cnt = 0; cnt < sizeof(os_access_acl_streams) / sizeof(int); cnt++) {
return bacl_exit_error;
}
-/**
+/*
* For this OSes setup the build and parse function pointer to the OS specific functions.
*/
static bacl_exit_code (*os_build_acl_streams)(JCR *jcr, FF_PKT *ff_pkt) = generic_build_acl_streams;
#elif defined(HAVE_OSF1_OS)
-/**
+/*
* Define the supported ACL streams for this OS
*/
static int os_access_acl_streams[1] = { STREAM_ACL_TRU64_ACCESS_ACL };
static bacl_exit_code tru64_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
{
- /**
+ /*
* Read access ACLs for files, dirs and links
*/
if ((jcr->acl_data->content_length = generic_get_acl_from_os(jcr, BACL_TYPE_ACCESS)) < 0)
if (!send_acl_stream(jcr, STREAM_ACL_TRU64_ACCESS_ACL))
return bacl_exit_error;
}
- /**
+ /*
* Directories can have default ACLs too
*/
if (ff_pkt->type == FT_DIREND) {
return generic_set_acl_on_os(jcr, BACL_TYPE_DEFAULT_DIR);
}
-/**
+/*
* For this OS setup the build and parse function pointer to the OS specific functions.
*/
static bacl_exit_code (*os_build_acl_streams)(JCR *jcr, FF_PKT *ff_pkt) = tru64_build_acl_streams;
#include <acllib.h>
-/**
+/*
* Define the supported ACL streams for this OS
*/
static int os_access_acl_streams[1] = { STREAM_ACL_HPUX_ACL_ENTRY };
static int os_default_acl_streams[1] = { -1 };
-/**
+/*
* See if an acl is a trivial one (e.g. just the stat bits encoded as acl.)
* There is no need to store those acls as we already store the stat bits too.
*/
for (n = 0; n < count; n++) {
ace = entries[n];
- /**
+ /*
* See if this acl just is the stat mode in acl form.
*/
if (!((ace.uid == sb.st_uid && ace.gid == ACL_NSGROUP) ||
return true;
}
-/**
+/*
* OS specific functions for handling different types of acl streams.
*/
static bacl_exit_code hpux_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
switch (errno) {
#if defined(BACL_ENOTSUP)
case BACL_ENOTSUP:
- /**
+ /*
* Not supported, just pretend there is nothing to see
*
* If the filesystem reports it doesn't support ACLs we clear the
}
if ((n = getacl(jcr->last_fname, n, acls)) > 0) {
if (acl_is_trivial(n, acls, ff_pkt->statp)) {
- /**
+ /*
* The ACLs simply reflect the (already known) standard permissions
* So we don't send an ACL stream to the SD.
*/
switch (errno) {
case ENOENT:
return bacl_exit_ok;
+#if defined(BACL_ENOTSUP)
+ case BACL_ENOTSUP:
+ /*
+ * If the filesystem reports it doesn't support ACLs we clear the
+ * BACL_FLAG_RESTORE_NATIVE flag so we skip ACL restores on all other files
+ * on the same filesystem. The BACL_FLAG_RESTORE_NATIVE flag gets set again
+ * when we change from one filesystem to an other.
+ */
+ jcr->acl_data->flags &= ~BACL_FLAG_SAVE_NATIVE;
+ Mmsg1(jcr->errmsg, _("setacl error on file \"%s\": filesystem doesn't support ACLs\n"),
+ jcr->last_fname);
+ Dmsg2(100, "setacl error acl=%s file=%s filesystem doesn't support ACLs\n",
+ jcr->acl_data->content, jcr->last_fname);
+ return bacl_exit_error;
+#endif
default:
Mmsg2(jcr->errmsg, _("setacl error on file \"%s\": ERR=%s\n"),
jcr->last_fname, be.bstrerror());
return bacl_exit_ok;
}
-/**
+/*
* For this OS setup the build and parse function pointer to the OS specific functions.
*/
static bacl_exit_code (*os_build_acl_streams)(JCR *jcr, FF_PKT *ff_pkt) = hpux_build_acl_streams;
char *acl_strerror(int);
}
-/**
+/*
* Define the supported ACL streams for this OS
*/
static int os_access_acl_streams[2] = { STREAM_ACL_SOLARIS_ACLENT, STREAM_ACL_SOLARIS_ACE };
bacl_exit_code stream_status = bacl_exit_error;
berrno be;
- /**
+ /*
* See if filesystem supports acls.
*/
acl_enabled = pathconf(jcr->last_fname, _PC_ACL_ENABLED);
switch (acl_enabled) {
case 0:
- /**
+ /*
* If the filesystem reports it doesn't support ACLs we clear the
* BACL_FLAG_SAVE_NATIVE flag so we skip ACL saves on all other files
* on the same filesystem. The BACL_FLAG_SAVE_NATIVE flag gets set again
break;
}
- /**
+ /*
* Get ACL info: don't bother allocating space if there is only a trivial ACL.
*/
if (acl_get(jcr->last_fname, ACL_NO_TRIVIAL, &aclp) != 0) {
}
if (!aclp) {
- /**
+ /*
* The ACLs simply reflect the (already known) standard permissions
* So we don't send an ACL stream to the SD.
*/
}
#if defined(ACL_SID_FMT)
- /**
+ /*
* New format flag added in newer Solaris versions.
*/
flags = ACL_APPEND_ID | ACL_COMPACT_FMT | ACL_SID_FMT;
case STREAM_UNIX_ACCESS_ACL:
case STREAM_ACL_SOLARIS_ACLENT:
case STREAM_ACL_SOLARIS_ACE:
- /**
+ /*
* First make sure the filesystem supports acls.
*/
acl_enabled = pathconf(jcr->last_fname, _PC_ACL_ENABLED);
switch (acl_enabled) {
case 0:
+ /*
+ * If the filesystem reports it doesn't support ACLs we clear the
+ * BACL_FLAG_RESTORE_NATIVE flag so we skip ACL restores on all other files
+ * on the same filesystem. The BACL_FLAG_RESTORE_NATIVE flag gets set again
+ * when we change from one filesystem to an other.
+ */
+ jcr->acl_data->flags &= ~BACL_FLAG_RESTORE_NATIVE;
Mmsg1(jcr->errmsg, _("Trying to restore acl on file \"%s\" on filesystem without acl support\n"),
jcr->last_fname);
return bacl_exit_error;
return bacl_exit_error;
}
default:
- /**
+ /*
* On a filesystem with ACL support make sure this particular ACL type can be restored.
*/
switch (stream) {
case STREAM_ACL_SOLARIS_ACLENT:
- /**
+ /*
* An aclent can be restored on filesystems with _ACL_ACLENT_ENABLED or _ACL_ACE_ENABLED support.
*/
if ((acl_enabled & (_ACL_ACLENT_ENABLED | _ACL_ACE_ENABLED)) == 0) {
}
break;
case STREAM_ACL_SOLARIS_ACE:
- /**
+ /*
* An ace can only be restored on a filesystem with _ACL_ACE_ENABLED support.
*/
if ((acl_enabled & _ACL_ACE_ENABLED) == 0) {
}
break;
default:
- /**
+ /*
* Stream id which doesn't describe the type of acl which is encoded.
*/
break;
return bacl_exit_error;
}
- /**
+ /*
* Validate that the conversion gave us the correct acl type.
*/
switch (stream) {
}
break;
default:
- /**
+ /*
* Stream id which doesn't describe the type of acl which is encoded.
*/
break;
#else /* HAVE_EXTENDED_ACL */
-/**
+/*
* Define the supported ACL streams for this OS
*/
static int os_access_acl_streams[2] = { STREAM_ACL_SOLARIS_ACLENT };
static int os_default_acl_streams[1] = { -1 };
-/**
+/*
* See if an acl is a trivial one (e.g. just the stat bits encoded as acl.)
* There is no need to store those acls as we already store the stat bits too.
*/
return true;
}
-/**
+/*
* OS specific functions for handling different types of acl streams.
*/
static bacl_exit_code solaris_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
acls = (aclent_t *)malloc(n * sizeof(aclent_t));
if (acl(jcr->last_fname, GETACL, n, acls) == n) {
if (acl_is_trivial(n, acls)) {
- /**
+ /*
* The ACLs simply reflect the (already known) standard permissions
* So we don't send an ACL stream to the SD.
*/
return bacl_exit_error;
}
- /**
+ /*
* Restore the ACLs, but don't complain about links which really should
* not have attributes, and the file it is linked to may not yet be restored.
*/
}
#endif /* HAVE_EXTENDED_ACL */
-/**
+/*
* For this OS setup the build and parse function pointer to the OS specific functions.
*/
static bacl_exit_code (*os_build_acl_streams)(JCR *jcr, FF_PKT *ff_pkt) = solaris_build_acl_streams;
*/
bacl_exit_code build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
{
- /**
+ /*
* See if we are changing from one device to an other.
- * We save the current device we are scanning and compare
+ * We save the current device we are restoring to and compare
* it with the current st_dev in the last stat performed on
* the file we are currently storing.
*/
if (jcr->acl_data->current_dev != ff_pkt->statp.st_dev) {
- /**
+ /*
* Reset the acl save flags.
*/
jcr->acl_data->flags = 0;
}
#if defined(HAVE_ACL)
- /**
+ /*
* See if the BACL_FLAG_SAVE_NATIVE flag is set which lets us know if we should
* save native ACLs.
*/
if (jcr->acl_data->flags & BACL_FLAG_SAVE_NATIVE) {
- /**
+ /*
* Call the appropriate function.
*/
if (os_build_acl_streams) {
- return (*os_build_acl_streams)(jcr, ff_pkt);
+ return os_build_acl_streams(jcr, ff_pkt);
}
} else {
return bacl_exit_ok;
bacl_exit_code parse_acl_streams(JCR *jcr, int stream)
{
+ int ret;
+ berrno be;
+ struct stat st;
unsigned int cnt;
+ /*
+ * See if we are changing from one device to an other.
+ * We save the current device we are restoring to and compare
+ * it with the current st_dev in the last stat performed on
+ * the file we are currently restoring.
+ */
+ ret = lstat(jcr->last_fname, &st);
+ switch (ret) {
+ case -1:
+ switch (errno) {
+ case ENOENT:
+ return bacl_exit_ok;
+ default:
+ Mmsg2(jcr->errmsg, _("Unable to stat file \"%s\": ERR=%s\n"),
+ jcr->last_fname, be.bstrerror());
+ Dmsg2(100, "Unable to stat file \"%s\": ERR=%s\n",
+ jcr->last_fname, be.bstrerror());
+ return bacl_exit_error;
+ }
+ break;
+ case 0:
+ break;
+ }
+ if (jcr->acl_data->current_dev != st.st_dev) {
+ /*
+ * Reset the acl save flags.
+ */
+ jcr->acl_data->flags = 0;
+ jcr->acl_data->flags |= BACL_FLAG_RESTORE_NATIVE;
+
+ /*
+ * Save that we started restoring to a new filesystem.
+ */
+ jcr->acl_data->current_dev = st.st_dev;
+ }
+
switch (stream) {
#if defined(HAVE_ACL)
case STREAM_UNIX_ACCESS_ACL:
case STREAM_UNIX_DEFAULT_ACL:
- /**
+ /*
* Handle legacy ACL streams.
*/
- if (os_parse_acl_streams) {
- return (*os_parse_acl_streams)(jcr, stream);
+ if ((jcr->acl_data->flags & BACL_FLAG_RESTORE_NATIVE) && os_parse_acl_streams) {
+ return os_parse_acl_streams(jcr, stream);
+ } else {
+ /*
+ * Increment error count but don't log an error again for the same filesystem.
+ */
+ jcr->acl_data->nr_errors++;
+ return bacl_exit_ok;
}
break;
default:
- if (os_parse_acl_streams) {
- /**
+ if ((jcr->acl_data->flags & BACL_FLAG_RESTORE_NATIVE) && os_parse_acl_streams) {
+ /*
* Walk the os_access_acl_streams array with the supported Access ACL streams for this OS.
*/
for (cnt = 0; cnt < sizeof(os_access_acl_streams) / sizeof(int); cnt++) {
if (os_access_acl_streams[cnt] == stream) {
- return (*os_parse_acl_streams)(jcr, stream);
+ return os_parse_acl_streams(jcr, stream);
}
}
- /**
+ /*
* Walk the os_default_acl_streams array with the supported Default ACL streams for this OS.
*/
for (cnt = 0; cnt < sizeof(os_default_acl_streams) / sizeof(int); cnt++) {
if (os_default_acl_streams[cnt] == stream) {
- return (*os_parse_acl_streams)(jcr, stream);
+ return os_parse_acl_streams(jcr, stream);
}
}
+ } else {
+ /*
+ * Increment error count but don't log an error again for the same filesystem.
+ */
+ jcr->acl_data->nr_errors++;
+ return bacl_exit_ok;
}
break;
#else
projects / bacula / bacula / blobdiff