--- /dev/null
+
+ This patch can be applied to version 3.0.1 and modifies xattr
+ handling to print warning or error messages when problems are
+ found without canceling the Job. This patch *must* be applied
+ after 3.0.1-acl-error.patch. It should fix the re-opened
+ bug #1305.
+
+ Apply it to version 3.0.1 with:
+
+ cd <bacula-source>
+ patch -p0 <3.0.1-xattr.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+Index: src/filed/xattr.c
+===================================================================
+--- src/filed/xattr.c (revision 8923)
++++ src/filed/xattr.c (working copy)
+@@ -96,7 +96,6 @@
+ if (!sd->fsend("%ld %d 0", jcr->JobFiles, stream)) {
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ sd->bstrerror());
+-
+ return false;
+ }
+
+@@ -112,7 +111,6 @@
+ sd->msglen = 0;
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ sd->bstrerror());
+-
+ return false;
+ }
+
+@@ -121,10 +119,8 @@
+ if (!sd->signal(BNET_EOD)) {
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ sd->bstrerror());
+-
+ return false;
+ }
+-
+ Dmsg1(200, "XATTR of file: %s successfully backed up!\n", jcr->last_fname);
+
+ return true;
+@@ -265,8 +261,7 @@
+ jcr->last_fname, be.bstrerror());
+ Dmsg2(100, "llistxattr error file=%s ERR=%s\n",
+ jcr->last_fname, be.bstrerror());
+-
+- return false;
++ return true; /* non-fatal return */
+ } else if (xattr_list_len == 0) {
+ return true;
+ }
+@@ -274,11 +269,7 @@
+ /*
+ * Allocate room for the extented attribute list.
+ */
+- if ((xattr_list = (char *)malloc(xattr_list_len + 1)) == (char *)NULL) {
+- Emsg1(M_ABORT, 0, _("Out of memory requesting %d bytes\n"), xattr_list_len + 1);
+-
+- return false;
+- }
++ xattr_list = (char *)malloc(xattr_list_len + 1);
+ memset((caddr_t)xattr_list, 0, xattr_list_len + 1);
+
+ /*
+@@ -291,10 +282,8 @@
+ jcr->last_fname, be.bstrerror());
+ Dmsg2(100, "llistxattr error file=%s ERR=%s\n",
+ jcr->last_fname, be.bstrerror());
+-
+ free(xattr_list);
+-
+- return false;
++ return true; /* non-fatal return */
+ }
+ xattr_list[xattr_list_len] = '\0';
+
+@@ -328,11 +317,7 @@
+ * Allocate enough room to hold all extended attributes.
+ * After allocating the storage make sure its empty by zeroing it.
+ */
+- if ((xattr_value_list = (xattr_t *)malloc(count * sizeof(xattr_t))) == (xattr_t *)NULL) {
+- Emsg1(M_ABORT, 0, _("Out of memory requesting %d bytes\n"), count * sizeof(xattr_t));
+-
+- return false;
+- }
++ xattr_value_list = (xattr_t *)malloc(count * sizeof(xattr_t));
+ memset((caddr_t)xattr_value_list, 0, count * sizeof(xattr_t));
+
+ /*
+@@ -345,7 +330,6 @@
+ #if defined(HAVE_LINUX_OS)
+ if (ff_pkt->flags & FO_ACL && !strcmp(bp, "system.posix_acl_access")) {
+ bp = strchr(bp, '\0') + 1;
+-
+ continue;
+ }
+ #endif
+@@ -360,11 +344,7 @@
+ * Allocate space for storing the name.
+ */
+ current_xattr->name_length = strlen(bp);
+- if ((current_xattr->name = (char *)malloc(current_xattr->name_length)) == (char *)NULL) {
+- Emsg1(M_ABORT, 0, _("Out of memory requesting %d bytes\n"), current_xattr->name_length);
+-
+- goto bail_out;
+- }
++ current_xattr->name = (char *)malloc(current_xattr->name_length);
+ memcpy((caddr_t)current_xattr->name, (caddr_t)bp, current_xattr->name_length);
+
+ expected_serialize_len += sizeof(current_xattr->name_length) + current_xattr->name_length;
+@@ -379,18 +359,13 @@
+ jcr->last_fname, be.bstrerror());
+ Dmsg2(100, "lgetxattr error file=%s ERR=%s\n",
+ jcr->last_fname, be.bstrerror());
+-
+ goto bail_out;
+ }
+
+ /*
+ * Allocate space for storing the value.
+ */
+- if ((current_xattr->value = (char *)malloc(xattr_value_len)) == (char *)NULL) {
+- Emsg1(M_ABORT, 0, _("Out of memory requesting %d bytes\n"), xattr_value_len);
+-
+- goto bail_out;
+- }
++ current_xattr->value = (char *)malloc(xattr_value_len);
+ memset((caddr_t)current_xattr->value, 0, xattr_value_len);
+
+ xattr_value_len = lgetxattr(jcr->last_fname, bp, current_xattr->value, xattr_value_len);
+@@ -400,7 +375,6 @@
+ jcr->last_fname, be.bstrerror());
+ Dmsg2(100, "lgetxattr error file=%s ERR=%s\n",
+ jcr->last_fname, be.bstrerror());
+-
+ goto bail_out;
+ }
+
+@@ -416,7 +390,6 @@
+ if (expected_serialize_len >= MAX_XATTR_STREAM) {
+ Jmsg2(jcr, M_ERROR, 0, _("Xattr stream on file \"%s\" exceeds maximum size of %d bytes\n"),
+ jcr->last_fname, MAX_XATTR_STREAM);
+-
+ goto bail_out;
+ }
+
+@@ -435,7 +408,6 @@
+ jcr->last_fname);
+ Dmsg1(100, "Failed to serialize extended attributes on file \"%s\"\n",
+ jcr->last_fname);
+-
+ goto bail_out;
+ }
+
+@@ -450,15 +422,14 @@
+ bail_out:
+ xattr_drop_internal_table(xattr_value_list);
+ free(xattr_list);
+-
+- return false;
++ return true; /* non-fatal return */
+ }
+
+ static bool generic_xattr_parse_streams(JCR *jcr)
+ {
+ unser_declare;
+ xattr_t current_xattr;
+- bool retval = true;
++ bool retval = true; /* default non-fatal */
+
+ /*
+ * Parse the stream and perform the setxattr calls on the file.
+@@ -478,8 +449,7 @@
+ jcr->last_fname);
+ Dmsg1(100, "Illegal xattr stream, no XATTR_MAGIC on file \"%s\"\n",
+ jcr->last_fname);
+-
+- return false;
++ return true; /* non-fatal return */
+ }
+
+ /*
+@@ -490,11 +460,7 @@
+ /*
+ * Allocate room for the name and decode its content.
+ */
+- if ((current_xattr.name = (char *)malloc(current_xattr.name_length + 1)) == (char *)NULL) {
+- Emsg1(M_ABORT, 0, _("Out of memory requesting %d bytes\n"), current_xattr.name_length + 1);
+-
+- return false;
+- }
++ current_xattr.name = (char *)malloc(current_xattr.name_length + 1);
+ unser_bytes(current_xattr.name, current_xattr.name_length);
+
+ /*
+@@ -510,11 +476,7 @@
+ /*
+ * Allocate room for the value and decode its content.
+ */
+- if ((current_xattr.value = (char *)malloc(current_xattr.value_length)) == (char *)NULL) {
+- Emsg1(M_ABORT, 0, _("Out of memory requesting %d bytes\n"), current_xattr.value_length);
+-
+- return false;
+- }
++ current_xattr.value = (char *)malloc(current_xattr.value_length);
+ unser_bytes(current_xattr.value, current_xattr.value_length);
+
+ /*
+@@ -529,12 +491,6 @@
+ jcr->last_fname, be.bstrerror());
+ Dmsg2(100, "lsetxattr error file=%s ERR=%s\n",
+ jcr->last_fname, be.bstrerror());
+-
+- /*
+- * Reset the return flag to false to indicate one or more extended attributes
+- * could not be restored.
+- */
+- retval = false;
+ }
+
+ /*
+@@ -560,7 +516,10 @@
+ case STREAM_XATTR_DARWIN:
+ return generic_xattr_parse_streams(jcr);
+ default:
+- return false;
++ Jmsg2(jcr, M_WARNING, 0,
++ _("Can't restore Extended Attributes of %s - incompatible xattr stream encountered - %d\n"),
++ jcr->last_fname, stream);
++ return true; /* non-fatal error */
+ }
+ }
+ #elif defined(HAVE_FREEBSD_OS)
+@@ -575,7 +534,10 @@
+ case STREAM_XATTR_FREEBSD:
+ return generic_xattr_parse_streams(jcr);
+ default:
+- return false;
++ Jmsg2(jcr, M_WARNING, 0,
++ _("Can't restore Extended Attributes of %s - incompatible xattr stream encountered - %d\n"),
++ jcr->last_fname, stream);
++ return true; /* non-fatal error */
+ }
+ }
+ #elif defined(HAVE_LINUX_OS)
+@@ -590,7 +552,10 @@
+ case STREAM_XATTR_LINUX:
+ return generic_xattr_parse_streams(jcr);
+ default:
+- return false;
++ Jmsg2(jcr, M_WARNING, 0,
++ _("Can't restore Extended Attributes of %s - incompatible xattr stream encountered - %d\n"),
++ jcr->last_fname, stream);
++ return true; /* non-fatal error */
+ }
+ }
+ #elif defined(HAVE_NETBSD_OS)
+@@ -605,7 +570,10 @@
+ case STREAM_XATTR_NETBSD:
+ return generic_xattr_parse_streams(jcr);
+ default:
+- return false;
++ Jmsg2(jcr, M_WARNING, 0,
++ _("Can't restore Extended Attributes of %s - incompatible xattr stream encountered - %d\n"),
++ jcr->last_fname, stream);
++ return true; /* non-fatal error */
+ }
+ }
+ #endif
+@@ -726,10 +694,11 @@
+ {
+ xattr_link_cache_entry_t *ptr;
+
+- for (ptr = xattr_link_cache_head; ptr != NULL; ptr = ptr->next)
+- if (ptr->inum == inum)
++ for (ptr = xattr_link_cache_head; ptr != NULL; ptr = ptr->next) {
++ if (ptr->inum == inum) {
+ return ptr;
+-
++ }
++ }
+ return NULL;
+ }
+
+@@ -737,16 +706,16 @@
+ {
+ xattr_link_cache_entry_t *ptr;
+
+- if ((ptr = (xattr_link_cache_entry_t *)malloc(sizeof(struct xattr_link_cache_entry))) != NULL) {
+- memset((caddr_t)ptr, 0, sizeof(struct xattr_link_cache_entry));
+- ptr->inum = inum;
+- strncpy(ptr->target, target, sizeof(ptr->target));
+- if (xattr_link_cache_head == NULL)
+- xattr_link_cache_head = ptr;
+- if (xattr_link_cache_tail != NULL)
+- xattr_link_cache_tail->next = ptr;
+- xattr_link_cache_tail = ptr;
++ ptr = (xattr_link_cache_entry_t *)malloc(sizeof(struct xattr_link_cache_entry));
++ memset((caddr_t)ptr, 0, sizeof(struct xattr_link_cache_entry));
++ ptr->inum = inum;
++ strncpy(ptr->target, target, sizeof(ptr->target));
++ if (xattr_link_cache_head == NULL) {
++ xattr_link_cache_head = ptr;
+ }
++ if (xattr_link_cache_tail != NULL)
++ xattr_link_cache_tail->next = ptr;
++ }
+ }
+
+ static void drop_xattr_link_cache(void)
+@@ -757,7 +726,6 @@
+ next = ptr->next;
+ free(ptr);
+ }
+-
+ xattr_link_cache_head = NULL;
+ xattr_link_cache_tail = NULL;
+ }
+@@ -828,9 +796,9 @@
+ }
+
+ cleanup:
+- if (response != NULL)
++ if (response != NULL) {
+ nvlist_free(response);
+-
++ }
+ return retval;
+ }
+ #endif /* HAVE_SYS_NVPAIR_H && _PC_SATTR_ENABLED */
+@@ -847,19 +815,17 @@
+
+ for (n = 0; n < count; n++) {
+ ace = &entries[n];
+-
+ if (!(ace->a_type == USER_OBJ ||
+ ace->a_type == GROUP_OBJ ||
+ ace->a_type == OTHER_OBJ ||
+ ace->a_type == CLASS_OBJ))
+ return false;
+ }
+-
+ return true;
+ }
+ #endif /* HAVE_ACL && !HAVE_EXTENDED_ACL */
+
+-static bool solaris_archive_xattr_acl(JCR *jcr, int fd, const char *attrname, char **acl_text)
++static bool solaris_save_xattr_acl(JCR *jcr, int fd, const char *attrname, char **acl_text)
+ {
+ #ifdef HAVE_ACL
+ #ifdef HAVE_EXTENDED_ACL
+@@ -881,8 +847,7 @@
+ attrname, jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "facl_get/acl_get of xattr %s on \"%s\" failed: ERR=%s\n",
+ attrname, jcr->last_fname, be.bstrerror());
+-
+- return false;
++ return true; /* non-fatal */
+ }
+
+ if (aclp != NULL) {
+@@ -912,10 +877,11 @@
+ /*
+ * See if this attribute has an ACL
+ */
+- if (fd != -1)
++ if (fd != -1) {
+ n = facl(fd, GETACLCNT, 0, NULL);
+- else
++ } else {
+ n = acl(attrname, GETACLCNT, 0, NULL);
++ }
+
+ if (n >= MIN_ACL_ENTRIES) {
+ acls = (aclent_t *)malloc(n * sizeof(aclent_t));
+@@ -926,9 +892,8 @@
+ attrname, jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "facl/acl of xattr %s on \"%s\" failed: ERR=%s\n",
+ attrname, jcr->last_fname, be.bstrerror());
+-
+ free(acls);
+- return false;
++ return true; /* non-fatal */
+ }
+
+ /*
+@@ -941,9 +906,8 @@
+ attrname, jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "acltotext of xattr %s on \"%s\" failed: ERR=%s\n",
+ attrname, jcr->last_fname, be.bstrerror());
+-
+ free(acls);
+- return false;
++ return true; /* non-fatal */
+ }
+ } else {
+ *acl_text = NULL;
+@@ -956,18 +920,19 @@
+
+ return true;
+ #endif /* HAVE_EXTENDED_ACL */
++
+ #else /* HAVE_ACL */
+- return NULL;
++ return false; /* fatal return */
+ #endif /* HAVE_ACL */
+ }
+
+ /*
+ * Forward declaration for recursive function call.
+ */
+-static bool solaris_archive_xattrs(JCR *jcr, const char *xattr_namespace, const char *attr_parent);
++static bool solaris_save_xattrs(JCR *jcr, const char *xattr_namespace, const char *attr_parent);
+
+ /*
+- * Archive an extended or extensible attribute.
++ * Save an extended or extensible attribute.
+ * This is stored as an opaque stream of bytes with the following encoding:
+ *
+ * <xattr_name>\0<stat_buffer>\0<acl_string>\0<actual_xattr_data>
+@@ -981,7 +946,7 @@
+ * acl_string is an acl text when a non trivial acl is set on the xattr.
+ * actual_xattr_data is the content of the xattr file.
+ */
+-static bool solaris_archive_xattr(JCR *jcr, int fd, const char *xattr_namespace,
++static bool solaris_save_xattr(JCR *jcr, int fd, const char *xattr_namespace,
+ const char *attrname, bool toplevel_hidden_dir, int stream)
+ {
+ int cnt;
+@@ -993,7 +958,7 @@
+ char *acl_text = NULL;
+ char attribs[MAXSTRING];
+ char buffer[BUFSIZ];
+- bool retval = false;
++ bool retval = true; /* default is non-fatal */
+
+ snprintf(target_attrname, sizeof(target_attrname), "%s%s", xattr_namespace, attrname);
+
+@@ -1006,7 +971,6 @@
+ target_attrname, jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "fstatat of xattr %s on \"%s\" failed: ERR=%s\n",
+ target_attrname, jcr->last_fname, be.bstrerror());
+-
+ goto cleanup;
+ }
+
+@@ -1022,7 +986,7 @@
+ /*
+ * Get any acl on the xattr.
+ */
+- if (!solaris_archive_xattr_acl(jcr, attrfd, attrname, &acl_text))
++ if (!solaris_save_xattr_acl(jcr, attrfd, attrname, &acl_text))
+ goto cleanup;
+
+ /*
+@@ -1033,15 +997,16 @@
+ cnt = snprintf(buffer, sizeof(buffer), "%s%c%s%c%s%c",
+ target_attrname, 0, attribs, 0, (acl_text) ? acl_text : "", 0);
+ break;
++
+ case S_IFDIR:
+ /*
+ * Get any acl on the xattr.
+ */
+- if (!solaris_archive_xattr_acl(jcr, attrfd, attrname, &acl_text))
++ if (!solaris_save_xattr_acl(jcr, attrfd, attrname, &acl_text))
+ goto cleanup;
+
+ /*
+- * See if this is the toplevel_hidden_dir being archived.
++ * See if this is the toplevel_hidden_dir being saved.
+ */
+ if (toplevel_hidden_dir) {
+ /*
+@@ -1054,7 +1019,6 @@
+ "%s%c%s%c%s%c",
+ target_attrname, 0, attribs, 0,
+ (acl_text) ? acl_text : "", 0);
+-
+ goto cleanup;
+ } else {
+ /*
+@@ -1088,7 +1052,7 @@
+ retval = send_xattr_stream(jcr, stream);
+
+ /*
+- * For a hard linked file we are ready now, no need to recursively archive the attributes.
++ * For a hard linked file we are ready now, no need to recursively save the attributes.
+ */
+ goto cleanup;
+ }
+@@ -1103,8 +1067,9 @@
+ /*
+ * Get any acl on the xattr.
+ */
+- if (!solaris_archive_xattr_acl(jcr, attrfd, attrname, &acl_text))
++ if (!solaris_save_xattr_acl(jcr, attrfd, attrname, &acl_text)) {
+ goto cleanup;
++ }
+
+ /*
+ * Encode the stat struct into an ASCII representation.
+@@ -1123,10 +1088,10 @@
+ target_attrname, jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "openat of xattr %s on \"%s\" failed: ERR=%s\n",
+ target_attrname, jcr->last_fname, be.bstrerror());
+-
+ goto cleanup;
+ }
+ break;
++
+ case S_IFLNK:
+ /*
+ * The current implementation of xattr on Solaris doesn't support this, but if it ever does we are prepared.
+@@ -1138,7 +1103,6 @@
+ target_attrname, jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "readlink of xattr %s on \"%s\" failed: ERR=%s\n",
+ target_attrname, jcr->last_fname, be.bstrerror());
+-
+ goto cleanup;
+ }
+
+@@ -1154,9 +1118,10 @@
+ retval = send_xattr_stream(jcr, stream);
+
+ /*
+- * For a soft linked file we are ready now, no need to recursively archive the attributes.
++ * For a soft linked file we are ready now, no need to recursively save the attributes.
+ */
+ goto cleanup;
++
+ default:
+ goto cleanup;
+ }
+@@ -1167,7 +1132,7 @@
+ if (nr_xattr_saved == 0) {
+ pm_memcpy(jcr->xattr_data, toplevel_hidden_dir_xattr_data, toplevel_hidden_dir_xattr_data_len);
+ jcr->xattr_data_len = toplevel_hidden_dir_xattr_data_len;
+- send_xattr_stream(jcr, STREAM_XATTR_SOLARIS);
++ retval = send_xattr_stream(jcr, STREAM_XATTR_SOLARIS);
+ }
+
+ pm_memcpy(jcr->xattr_data, buffer, cnt);
+@@ -1185,7 +1150,6 @@
+ if (st.st_size >= MAX_XATTR_STREAM) {
+ Jmsg2(jcr, M_ERROR, 0, _("Xattr stream on file \"%s\" exceeds maximum size of %d bytes\n"),
+ jcr->last_fname, MAX_XATTR_STREAM);
+-
+ goto cleanup;
+ }
+
+@@ -1200,24 +1164,26 @@
+ target_attrname, jcr->last_fname);
+ Dmsg2(100, "read of data from xattr %s on \"%s\" failed\n",
+ target_attrname, jcr->last_fname);
+-
+ goto cleanup;
+ }
+ }
+ break;
++
+ default:
+ break;
+ }
+
+- retval = send_xattr_stream(jcr, stream);
+- nr_xattr_saved++;
++ if (retval) {
++ retval = send_xattr_stream(jcr, stream);
++ nr_xattr_saved++;
++ }
+
+ /*
+- * Recursivly call solaris_archive_extended_attributes for archiving the attributes
++ * Recursivly call solaris_save_extended_attributes for archiving the attributes
+ * available on this extended attribute.
+ */
+ if (retval) {
+- retval = solaris_archive_xattrs(jcr, xattr_namespace, attrname);
++ retval = solaris_save_xattrs(jcr, xattr_namespace, attrname);
+
+ /*
+ * The recursive call could change our working dir so change back to the wanted workdir.
+@@ -1228,28 +1194,28 @@
+ jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "Unable to fchdir to xattr space of file \"%s\" using fd %d: ERR=%s\n",
+ jcr->last_fname, fd, be.bstrerror());
+-
+ goto cleanup;
+ }
+ }
+
+ cleanup:
+- if (acl_text)
++ if (acl_text) {
+ free(acl_text);
+- if (attrfd != -1)
++ }
++ if (attrfd != -1) {
+ close(attrfd);
+-
++ }
+ return retval;
+ }
+
+-static bool solaris_archive_xattrs(JCR *jcr, const char *xattr_namespace, const char *attr_parent)
++static bool solaris_save_xattrs(JCR *jcr, const char *xattr_namespace, const char *attr_parent)
+ {
+ const char *name;
+ int fd, filefd = -1, attrdirfd = -1;
+ DIR *dirp;
+ struct dirent *dp;
+ char current_xattr_namespace[PATH_MAX];
+- bool retval = false;
++ bool retval = true; /* default non-fatal error */
+
+ /*
+ * Determine what argument to use. Use attr_parent when set
+@@ -1258,18 +1224,19 @@
+ */
+ if (attr_parent) {
+ name = attr_parent;
+- if (xattr_namespace)
++ if (xattr_namespace) {
+ snprintf(current_xattr_namespace, sizeof(current_xattr_namespace), "%s%s/",
+ xattr_namespace, attr_parent);
+- else
+- strcpy(current_xattr_namespace, "/");
++ } else {
++ strncpy(current_xattr_namespace, "/", sizeof(current_xattr_namespace));
++ }
+ } else {
+ name = jcr->last_fname;
+- strcpy(current_xattr_namespace, "/");
++ strncpy(current_xattr_namespace, "/", sizeof(current_xattr_namespace));
+ }
+
+ /*
+- * Open the file on which to archive the xattrs read-only.
++ * Open the file on which to save the xattrs read-only.
+ */
+ if ((filefd = open(name, O_RDONLY | O_NONBLOCK)) < 0) {
+ berrno be;
+@@ -1277,7 +1244,6 @@
+ jcr->last_fname, be.bstrerror());
+ Dmsg2(100, "Unable to open file \"%s\": ERR=%s\n",
+ jcr->last_fname, be.bstrerror());
+-
+ goto cleanup;
+ }
+
+@@ -1301,13 +1267,12 @@
+ Dmsg3(100, "Unable to open xattr space %s on file \"%s\": ERR=%s\n",
+ name, jcr->last_fname, be.bstrerror());
+ }
+-
+ goto cleanup;
+ }
+
+ /*
+ * We need to change into the attribute directory to determine if each of the
+- * attributes should be archived.
++ * attributes should be saved.
+ */
+ if (fchdir(attrdirfd) < 0) {
+ berrno be;
+@@ -1315,7 +1280,6 @@
+ jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "Unable to fchdir to xattr space on file \"%s\" using fd %d: ERR=%s\n",
+ jcr->last_fname, attrdirfd, be.bstrerror());
+-
+ goto cleanup;
+ }
+
+@@ -1325,7 +1289,7 @@
+ * And as we want this entry before anything else we better just save its data.
+ */
+ if (!attr_parent)
+- solaris_archive_xattr(jcr, attrdirfd, current_xattr_namespace, ".",
++ solaris_save_xattr(jcr, attrdirfd, current_xattr_namespace, ".",
+ true, STREAM_XATTR_SOLARIS);
+
+ if ((fd = dup(attrdirfd)) == -1 ||
+@@ -1381,23 +1345,22 @@
+ if (!solaris_has_non_transient_extensible_attributes(filefd)) {
+ Dmsg3(400, "Skipping transient extensible attributes %s%s on file \"%s\"\n",
+ current_xattr_namespace, dp->d_name, jcr->last_fname);
+-
+ continue;
+ }
+
+ /*
+- * Archive the xattr.
++ * Save the xattr.
+ */
+- solaris_archive_xattr(jcr, attrdirfd, current_xattr_namespace, dp->d_name,
++ solaris_save_xattr(jcr, attrdirfd, current_xattr_namespace, dp->d_name,
+ false, STREAM_XATTR_SOLARIS_SYS);
+ continue;
+ }
+ #endif /* HAVE_SYS_NVPAIR_H && _PC_SATTR_ENABLED */
+
+ /*
+- * Archive the xattr.
++ * Save the xattr.
+ */
+- solaris_archive_xattr(jcr, attrdirfd, current_xattr_namespace, dp->d_name,
++ solaris_save_xattr(jcr, attrdirfd, current_xattr_namespace, dp->d_name,
+ false, STREAM_XATTR_SOLARIS);
+ }
+
+@@ -1409,7 +1372,6 @@
+ close(attrdirfd);
+ if (filefd != -1)
+ close(filefd);
+-
+ return retval;
+ }
+
+@@ -1421,7 +1383,9 @@
+ acl_t *aclp = NULL;
+
+ if ((error = acl_fromtext(acl_text, &aclp)) != 0) {
+- return false;
++ Jmsg1(jcr, M_ERROR, 0, _("Unable to convert acl from text on file \"%s\"\n"
++ jcr->last_fname));
++ return true; /* non-fatal */
+ }
+
+ if ((fd != -1 && facl_set(fd, aclp) != 0) ||
+@@ -1431,14 +1395,14 @@
+ attrname, jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "Unable to restore acl of xattr %s on file \"%s\": ERR=%s\n",
+ attrname, jcr->last_fname, be.bstrerror());
+-
+- return false;
++ return true; /* non-fatal */
+ }
+
+- if (aclp)
++ if (aclp) {
+ acl_free(aclp);
+-
++ }
+ return true;
++
+ #else /* HAVE_EXTENDED_ACL */
+ int n;
+ aclent_t *acls = NULL;
+@@ -1452,16 +1416,17 @@
+ attrname, jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "Unable to restore acl of xattr %s on file \"%s\": ERR=%s\n",
+ attrname, jcr->last_fname, be.bstrerror());
+-
+- return false;
++ return true; /* non-fatal */
+ }
+ }
+
+- if (acls)
++ if (acls) {
+ free(acls);
+-
++ }
+ return true;
++
+ #endif /* HAVE_EXTENDED_ACL */
++
+ }
+ #endif /* HAVE_ACL */
+
+@@ -1476,7 +1441,7 @@
+ int32_t inum;
+ struct stat st;
+ struct timeval times[2];
+- bool retval = false;
++ bool retval = true; /* default non-fatal */
+
+ /*
+ * Parse the xattr stream. First the part that is the same for all xattrs.
+@@ -1505,7 +1470,6 @@
+ jcr->last_fname, be.bstrerror());
+ Dmsg2(100, "Unable to open file \"%s\": ERR=%s\n",
+ jcr->last_fname, be.bstrerror());
+-
+ goto cleanup;
+ }
+
+@@ -1518,7 +1482,6 @@
+ jcr->last_fname, be.bstrerror());
+ Dmsg2(100, "Unable to open xattr space on file \"%s\": ERR=%s\n",
+ jcr->last_fname, be.bstrerror());
+-
+ goto cleanup;
+ }
+
+@@ -1528,7 +1491,6 @@
+ jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "Unable to fchdir to xattr space on file \"%s\" using fd %d: ERR=%s\n",
+ jcr->last_fname, attrdirfd, be.bstrerror());
+-
+ goto cleanup;
+ }
+
+@@ -1546,7 +1508,6 @@
+ target_attrname, jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "Unable to open xattr %s on file \"%s\": ERR=%s\n",
+ target_attrname, jcr->last_fname, be.bstrerror());
+-
+ goto cleanup;
+ }
+
+@@ -1562,7 +1523,6 @@
+ target_attrname, jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "Unable to open xattr space %s on file \"%s\": ERR=%s\n",
+ target_attrname, jcr->last_fname, be.bstrerror());
+-
+ goto cleanup;
+ }
+
+@@ -1578,7 +1538,6 @@
+ target_attrname, jcr->last_fname, be.bstrerror());
+ Dmsg4(100, "Unable to fchdir to xattr space %s on file \"%s\" using fd %d: ERR=%s\n",
+ target_attrname, jcr->last_fname, attrdirfd, be.bstrerror());
+-
+ goto cleanup;
+ }
+
+@@ -1616,8 +1575,7 @@
+ target_attrname, jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "Unable to mkfifo xattr %s on file \"%s\": ERR=%s\n",
+ target_attrname, jcr->last_fname, be.bstrerror());
+-
+- goto cleanup;
++ goto cleanup;
+ }
+ break;
+ case S_IFCHR:
+@@ -1632,7 +1590,6 @@
+ target_attrname, jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "Unable to mknod xattr %s on file \"%s\": ERR=%s\n",
+ target_attrname, jcr->last_fname, be.bstrerror());
+-
+ goto cleanup;
+ }
+ break;
+@@ -1649,7 +1606,6 @@
+ target_attrname, jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "Unable to mkdir xattr %s on file \"%s\": ERR=%s\n",
+ target_attrname, jcr->last_fname, be.bstrerror());
+-
+ goto cleanup;
+ }
+ }
+@@ -1668,7 +1624,6 @@
+ target_attrname, linked_target, jcr->last_fname, be.bstrerror());
+ Dmsg4(100, "Unable to link xattr %s to %s on file \"%s\": ERR=%s\n",
+ target_attrname, linked_target, jcr->last_fname, be.bstrerror());
+-
+ goto cleanup;
+ }
+
+@@ -1699,7 +1654,6 @@
+ target_attrname, jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "Unable to open xattr %s on file \"%s\": ERR=%s\n",
+ target_attrname, jcr->last_fname, be.bstrerror());
+-
+ goto cleanup;
+ }
+ }
+@@ -1720,7 +1674,6 @@
+ target_attrname, jcr->last_fname);
+ Dmsg2(100, "Unable to restore data of xattr %s on file \"%s\": Not all data available in xattr stream\n",
+ target_attrname, jcr->last_fname);
+-
+ goto cleanup;
+ }
+
+@@ -1732,7 +1685,6 @@
+ target_attrname, jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "Unable to restore data of xattr %s on file \"%s\": ERR=%s\n",
+ target_attrname, jcr->last_fname, be.bstrerror());
+-
+ goto cleanup;
+ }
+
+@@ -1754,7 +1706,6 @@
+ target_attrname, linked_target, jcr->last_fname, be.bstrerror());
+ Dmsg4(100, "Unable to symlink xattr %s to %s on file \"%s\": ERR=%s\n",
+ target_attrname, linked_target, jcr->last_fname, be.bstrerror());
+-
+ goto cleanup;
+ }
+
+@@ -1787,7 +1738,6 @@
+ Dmsg3(100, "Unable to restore owner of xattr %s on file \"%s\": ERR=%s\n",
+ target_attrname, jcr->last_fname, be.bstrerror());
+ }
+-
+ goto cleanup;
+ }
+ }
+@@ -1813,7 +1763,6 @@
+ target_attrname, jcr->last_fname, be.bstrerror());
+ Dmsg3(100, "Unable to restore filetimes of xattr %s on file \"%s\": ERR=%s\n",
+ target_attrname, jcr->last_fname, be.bstrerror());
+-
+ goto cleanup;
+ }
+ }
+@@ -1831,13 +1780,15 @@
+ jcr->last_fname);
+
+ cleanup:
+- if (attrfd != -1)
++ if (attrfd != -1) {
+ close(attrfd);
+- if (attrdirfd != -1)
++ }
++ if (attrdirfd != -1) {
+ close(attrdirfd);
+- if (filefd != -1)
++ }
++ if (filefd != -1) {
+ close(filefd);
+-
++ }
+ return retval;
+ }
+
+@@ -1859,8 +1810,7 @@
+ jcr->last_fname);
+ Dmsg1(100, "Unable to restore extensible attributes on file \"%s\", filesystem doesn't support this\n",
+ jcr->last_fname);
+-
+- return false;
++ return true;
+ }
+
+ is_extensible = true;
+@@ -1873,13 +1823,11 @@
+ jcr->last_fname);
+ Dmsg1(100, "Unable to restore extended attributes on file \"%s\", filesystem doesn't support this\n",
+ jcr->last_fname);
+-
+- return false;
++ return true;
+ }
+-
+ break;
+ default:
+- return false;
++ return true;
+ }
+
+ /*
+@@ -1889,7 +1837,6 @@
+ getcwd(cwd, sizeof(cwd));
+ retval = solaris_restore_xattrs(jcr, is_extensible);
+ chdir(cwd);
+-
+ return retval;
+ }
+
+@@ -1906,13 +1853,12 @@
+ nr_xattr_saved = 0;
+
+ /*
+- * As we change the cwd in the archive function save the current cwd
+- * for restore after return from the solaris_archive_xattrs function.
++ * As we change the cwd in the save function save the current cwd
++ * for restore after return from the solaris_save_xattrs function.
+ */
+ getcwd(cwd, sizeof(cwd));
+- retval = solaris_archive_xattrs(jcr, NULL, NULL);
++ retval = solaris_save_xattrs(jcr, NULL, NULL);
+ chdir(cwd);
+-
+ drop_xattr_link_cache();
+ }
+
+@@ -1928,7 +1874,10 @@
+ case STREAM_XATTR_SOLARIS:
+ return solaris_extract_xattr(jcr, stream);
+ default:
+- return false;
++ Jmsg2(jcr, M_WARNING, 0,
++ _("Can't restore Extended Attributes of %s - incompatible xattr stream encountered - %d\n"),
++ jcr->last_fname, stream);
++ return true; /* non-fatal error */
+ }
+ }
+ #endif
if (!sd->fsend("%ld %d 0", jcr->JobFiles, stream)) {
Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
sd->bstrerror());
-
return false;
}
sd->msglen = 0;
Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
sd->bstrerror());
-
return false;
}
if (!sd->signal(BNET_EOD)) {
Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
sd->bstrerror());
-
return false;
}
-
Dmsg1(200, "XATTR of file: %s successfully backed up!\n", jcr->last_fname);
return true;
jcr->last_fname, be.bstrerror());
Dmsg2(100, "llistxattr error file=%s ERR=%s\n",
jcr->last_fname, be.bstrerror());
-
- return false;
+ return true; /* non-fatal return */
} else if (xattr_list_len == 0) {
return true;
}
/*
* Allocate room for the extented attribute list.
*/
- if ((xattr_list = (char *)malloc(xattr_list_len + 1)) == (char *)NULL) {
- Emsg1(M_ABORT, 0, _("Out of memory requesting %d bytes\n"), xattr_list_len + 1);
-
- return false;
- }
+ xattr_list = (char *)malloc(xattr_list_len + 1);
memset((caddr_t)xattr_list, 0, xattr_list_len + 1);
/*
jcr->last_fname, be.bstrerror());
Dmsg2(100, "llistxattr error file=%s ERR=%s\n",
jcr->last_fname, be.bstrerror());
-
free(xattr_list);
-
- return false;
+ return true; /* non-fatal return */
}
xattr_list[xattr_list_len] = '\0';
* Allocate enough room to hold all extended attributes.
* After allocating the storage make sure its empty by zeroing it.
*/
- if ((xattr_value_list = (xattr_t *)malloc(count * sizeof(xattr_t))) == (xattr_t *)NULL) {
- Emsg1(M_ABORT, 0, _("Out of memory requesting %d bytes\n"), count * sizeof(xattr_t));
-
- return false;
- }
+ xattr_value_list = (xattr_t *)malloc(count * sizeof(xattr_t));
memset((caddr_t)xattr_value_list, 0, count * sizeof(xattr_t));
/*
#if defined(HAVE_LINUX_OS)
if (ff_pkt->flags & FO_ACL && !strcmp(bp, "system.posix_acl_access")) {
bp = strchr(bp, '\0') + 1;
-
continue;
}
#endif
* Allocate space for storing the name.
*/
current_xattr->name_length = strlen(bp);
- if ((current_xattr->name = (char *)malloc(current_xattr->name_length)) == (char *)NULL) {
- Emsg1(M_ABORT, 0, _("Out of memory requesting %d bytes\n"), current_xattr->name_length);
-
- goto bail_out;
- }
+ current_xattr->name = (char *)malloc(current_xattr->name_length);
memcpy((caddr_t)current_xattr->name, (caddr_t)bp, current_xattr->name_length);
expected_serialize_len += sizeof(current_xattr->name_length) + current_xattr->name_length;
jcr->last_fname, be.bstrerror());
Dmsg2(100, "lgetxattr error file=%s ERR=%s\n",
jcr->last_fname, be.bstrerror());
-
goto bail_out;
}
/*
* Allocate space for storing the value.
*/
- if ((current_xattr->value = (char *)malloc(xattr_value_len)) == (char *)NULL) {
- Emsg1(M_ABORT, 0, _("Out of memory requesting %d bytes\n"), xattr_value_len);
-
- goto bail_out;
- }
+ current_xattr->value = (char *)malloc(xattr_value_len);
memset((caddr_t)current_xattr->value, 0, xattr_value_len);
xattr_value_len = lgetxattr(jcr->last_fname, bp, current_xattr->value, xattr_value_len);
jcr->last_fname, be.bstrerror());
Dmsg2(100, "lgetxattr error file=%s ERR=%s\n",
jcr->last_fname, be.bstrerror());
-
goto bail_out;
}
if (expected_serialize_len >= MAX_XATTR_STREAM) {
Jmsg2(jcr, M_ERROR, 0, _("Xattr stream on file \"%s\" exceeds maximum size of %d bytes\n"),
jcr->last_fname, MAX_XATTR_STREAM);
-
goto bail_out;
}
jcr->last_fname);
Dmsg1(100, "Failed to serialize extended attributes on file \"%s\"\n",
jcr->last_fname);
-
goto bail_out;
}
bail_out:
xattr_drop_internal_table(xattr_value_list);
free(xattr_list);
-
- return false;
+ return true; /* non-fatal return */
}
static bool generic_xattr_parse_streams(JCR *jcr)
{
unser_declare;
xattr_t current_xattr;
- bool retval = true;
+ bool retval = true; /* default non-fatal */
/*
* Parse the stream and perform the setxattr calls on the file.
jcr->last_fname);
Dmsg1(100, "Illegal xattr stream, no XATTR_MAGIC on file \"%s\"\n",
jcr->last_fname);
-
- return false;
+ return true; /* non-fatal return */
}
/*
/*
* Allocate room for the name and decode its content.
*/
- if ((current_xattr.name = (char *)malloc(current_xattr.name_length + 1)) == (char *)NULL) {
- Emsg1(M_ABORT, 0, _("Out of memory requesting %d bytes\n"), current_xattr.name_length + 1);
-
- return false;
- }
+ current_xattr.name = (char *)malloc(current_xattr.name_length + 1);
unser_bytes(current_xattr.name, current_xattr.name_length);
/*
/*
* Allocate room for the value and decode its content.
*/
- if ((current_xattr.value = (char *)malloc(current_xattr.value_length)) == (char *)NULL) {
- Emsg1(M_ABORT, 0, _("Out of memory requesting %d bytes\n"), current_xattr.value_length);
-
- return false;
- }
+ current_xattr.value = (char *)malloc(current_xattr.value_length);
unser_bytes(current_xattr.value, current_xattr.value_length);
/*
jcr->last_fname, be.bstrerror());
Dmsg2(100, "lsetxattr error file=%s ERR=%s\n",
jcr->last_fname, be.bstrerror());
-
- /*
- * Reset the return flag to false to indicate one or more extended attributes
- * could not be restored.
- */
- retval = false;
}
/*
case STREAM_XATTR_DARWIN:
return generic_xattr_parse_streams(jcr);
default:
- return false;
+ Jmsg2(jcr, M_WARNING, 0,
+ _("Can't restore Extended Attributes of %s - incompatible xattr stream encountered - %d\n"),
+ jcr->last_fname, stream);
+ return true; /* non-fatal error */
}
}
#elif defined(HAVE_FREEBSD_OS)
case STREAM_XATTR_FREEBSD:
return generic_xattr_parse_streams(jcr);
default:
- return false;
+ Jmsg2(jcr, M_WARNING, 0,
+ _("Can't restore Extended Attributes of %s - incompatible xattr stream encountered - %d\n"),
+ jcr->last_fname, stream);
+ return true; /* non-fatal error */
}
}
#elif defined(HAVE_LINUX_OS)
case STREAM_XATTR_LINUX:
return generic_xattr_parse_streams(jcr);
default:
- return false;
+ Jmsg2(jcr, M_WARNING, 0,
+ _("Can't restore Extended Attributes of %s - incompatible xattr stream encountered - %d\n"),
+ jcr->last_fname, stream);
+ return true; /* non-fatal error */
}
}
#elif defined(HAVE_NETBSD_OS)
case STREAM_XATTR_NETBSD:
return generic_xattr_parse_streams(jcr);
default:
- return false;
+ Jmsg2(jcr, M_WARNING, 0,
+ _("Can't restore Extended Attributes of %s - incompatible xattr stream encountered - %d\n"),
+ jcr->last_fname, stream);
+ return true; /* non-fatal error */
}
}
#endif
{
xattr_link_cache_entry_t *ptr;
- for (ptr = xattr_link_cache_head; ptr != NULL; ptr = ptr->next)
- if (ptr->inum == inum)
+ for (ptr = xattr_link_cache_head; ptr != NULL; ptr = ptr->next) {
+ if (ptr->inum == inum) {
return ptr;
-
+ }
+ }
return NULL;
}
{
xattr_link_cache_entry_t *ptr;
- if ((ptr = (xattr_link_cache_entry_t *)malloc(sizeof(struct xattr_link_cache_entry))) != NULL) {
- memset((caddr_t)ptr, 0, sizeof(struct xattr_link_cache_entry));
- ptr->inum = inum;
- strncpy(ptr->target, target, sizeof(ptr->target));
- if (xattr_link_cache_head == NULL)
- xattr_link_cache_head = ptr;
- if (xattr_link_cache_tail != NULL)
- xattr_link_cache_tail->next = ptr;
- xattr_link_cache_tail = ptr;
+ ptr = (xattr_link_cache_entry_t *)malloc(sizeof(struct xattr_link_cache_entry));
+ memset((caddr_t)ptr, 0, sizeof(struct xattr_link_cache_entry));
+ ptr->inum = inum;
+ strncpy(ptr->target, target, sizeof(ptr->target));
+ if (xattr_link_cache_head == NULL) {
+ xattr_link_cache_head = ptr;
+ }
+ if (xattr_link_cache_tail != NULL)
+ xattr_link_cache_tail->next = ptr;
}
}
next = ptr->next;
free(ptr);
}
-
xattr_link_cache_head = NULL;
xattr_link_cache_tail = NULL;
}
}
cleanup:
- if (response != NULL)
+ if (response != NULL) {
nvlist_free(response);
-
+ }
return retval;
}
#endif /* HAVE_SYS_NVPAIR_H && _PC_SATTR_ENABLED */
for (n = 0; n < count; n++) {
ace = &entries[n];
-
if (!(ace->a_type == USER_OBJ ||
ace->a_type == GROUP_OBJ ||
ace->a_type == OTHER_OBJ ||
ace->a_type == CLASS_OBJ))
return false;
}
-
return true;
}
#endif /* HAVE_ACL && !HAVE_EXTENDED_ACL */
-static bool solaris_archive_xattr_acl(JCR *jcr, int fd, const char *attrname, char **acl_text)
+static bool solaris_save_xattr_acl(JCR *jcr, int fd, const char *attrname, char **acl_text)
{
#ifdef HAVE_ACL
#ifdef HAVE_EXTENDED_ACL
attrname, jcr->last_fname, be.bstrerror());
Dmsg3(100, "facl_get/acl_get of xattr %s on \"%s\" failed: ERR=%s\n",
attrname, jcr->last_fname, be.bstrerror());
-
- return false;
+ return true; /* non-fatal */
}
if (aclp != NULL) {
/*
* See if this attribute has an ACL
*/
- if (fd != -1)
+ if (fd != -1) {
n = facl(fd, GETACLCNT, 0, NULL);
- else
+ } else {
n = acl(attrname, GETACLCNT, 0, NULL);
+ }
if (n >= MIN_ACL_ENTRIES) {
acls = (aclent_t *)malloc(n * sizeof(aclent_t));
attrname, jcr->last_fname, be.bstrerror());
Dmsg3(100, "facl/acl of xattr %s on \"%s\" failed: ERR=%s\n",
attrname, jcr->last_fname, be.bstrerror());
-
free(acls);
- return false;
+ return true; /* non-fatal */
}
/*
attrname, jcr->last_fname, be.bstrerror());
Dmsg3(100, "acltotext of xattr %s on \"%s\" failed: ERR=%s\n",
attrname, jcr->last_fname, be.bstrerror());
-
free(acls);
- return false;
+ return true; /* non-fatal */
}
} else {
*acl_text = NULL;
return true;
#endif /* HAVE_EXTENDED_ACL */
+
#else /* HAVE_ACL */
- return NULL;
+ return false; /* fatal return */
#endif /* HAVE_ACL */
}
/*
* Forward declaration for recursive function call.
*/
-static bool solaris_archive_xattrs(JCR *jcr, const char *xattr_namespace, const char *attr_parent);
+static bool solaris_save_xattrs(JCR *jcr, const char *xattr_namespace, const char *attr_parent);
/*
- * Archive an extended or extensible attribute.
+ * Save an extended or extensible attribute.
* This is stored as an opaque stream of bytes with the following encoding:
*
* <xattr_name>\0<stat_buffer>\0<acl_string>\0<actual_xattr_data>
* acl_string is an acl text when a non trivial acl is set on the xattr.
* actual_xattr_data is the content of the xattr file.
*/
-static bool solaris_archive_xattr(JCR *jcr, int fd, const char *xattr_namespace,
+static bool solaris_save_xattr(JCR *jcr, int fd, const char *xattr_namespace,
const char *attrname, bool toplevel_hidden_dir, int stream)
{
int cnt;
char *acl_text = NULL;
char attribs[MAXSTRING];
char buffer[BUFSIZ];
- bool retval = false;
+ bool retval = true; /* default is non-fatal */
snprintf(target_attrname, sizeof(target_attrname), "%s%s", xattr_namespace, attrname);
target_attrname, jcr->last_fname, be.bstrerror());
Dmsg3(100, "fstatat of xattr %s on \"%s\" failed: ERR=%s\n",
target_attrname, jcr->last_fname, be.bstrerror());
-
goto cleanup;
}
/*
* Get any acl on the xattr.
*/
- if (!solaris_archive_xattr_acl(jcr, attrfd, attrname, &acl_text))
+ if (!solaris_save_xattr_acl(jcr, attrfd, attrname, &acl_text))
goto cleanup;
/*
cnt = snprintf(buffer, sizeof(buffer), "%s%c%s%c%s%c",
target_attrname, 0, attribs, 0, (acl_text) ? acl_text : "", 0);
break;
+
case S_IFDIR:
/*
* Get any acl on the xattr.
*/
- if (!solaris_archive_xattr_acl(jcr, attrfd, attrname, &acl_text))
+ if (!solaris_save_xattr_acl(jcr, attrfd, attrname, &acl_text))
goto cleanup;
/*
- * See if this is the toplevel_hidden_dir being archived.
+ * See if this is the toplevel_hidden_dir being saved.
*/
if (toplevel_hidden_dir) {
/*
"%s%c%s%c%s%c",
target_attrname, 0, attribs, 0,
(acl_text) ? acl_text : "", 0);
-
goto cleanup;
} else {
/*
retval = send_xattr_stream(jcr, stream);
/*
- * For a hard linked file we are ready now, no need to recursively archive the attributes.
+ * For a hard linked file we are ready now, no need to recursively save the attributes.
*/
goto cleanup;
}
/*
* Get any acl on the xattr.
*/
- if (!solaris_archive_xattr_acl(jcr, attrfd, attrname, &acl_text))
+ if (!solaris_save_xattr_acl(jcr, attrfd, attrname, &acl_text)) {
goto cleanup;
+ }
/*
* Encode the stat struct into an ASCII representation.
target_attrname, jcr->last_fname, be.bstrerror());
Dmsg3(100, "openat of xattr %s on \"%s\" failed: ERR=%s\n",
target_attrname, jcr->last_fname, be.bstrerror());
-
goto cleanup;
}
break;
+
case S_IFLNK:
/*
* The current implementation of xattr on Solaris doesn't support this, but if it ever does we are prepared.
target_attrname, jcr->last_fname, be.bstrerror());
Dmsg3(100, "readlink of xattr %s on \"%s\" failed: ERR=%s\n",
target_attrname, jcr->last_fname, be.bstrerror());
-
goto cleanup;
}
retval = send_xattr_stream(jcr, stream);
/*
- * For a soft linked file we are ready now, no need to recursively archive the attributes.
+ * For a soft linked file we are ready now, no need to recursively save the attributes.
*/
goto cleanup;
+
default:
goto cleanup;
}
if (nr_xattr_saved == 0) {
pm_memcpy(jcr->xattr_data, toplevel_hidden_dir_xattr_data, toplevel_hidden_dir_xattr_data_len);
jcr->xattr_data_len = toplevel_hidden_dir_xattr_data_len;
- send_xattr_stream(jcr, STREAM_XATTR_SOLARIS);
+ retval = send_xattr_stream(jcr, STREAM_XATTR_SOLARIS);
}
pm_memcpy(jcr->xattr_data, buffer, cnt);
if (st.st_size >= MAX_XATTR_STREAM) {
Jmsg2(jcr, M_ERROR, 0, _("Xattr stream on file \"%s\" exceeds maximum size of %d bytes\n"),
jcr->last_fname, MAX_XATTR_STREAM);
-
goto cleanup;
}
target_attrname, jcr->last_fname);
Dmsg2(100, "read of data from xattr %s on \"%s\" failed\n",
target_attrname, jcr->last_fname);
-
goto cleanup;
}
}
break;
+
default:
break;
}
- retval = send_xattr_stream(jcr, stream);
- nr_xattr_saved++;
+ if (retval) {
+ retval = send_xattr_stream(jcr, stream);
+ nr_xattr_saved++;
+ }
/*
- * Recursivly call solaris_archive_extended_attributes for archiving the attributes
+ * Recursivly call solaris_save_extended_attributes for archiving the attributes
* available on this extended attribute.
*/
if (retval) {
- retval = solaris_archive_xattrs(jcr, xattr_namespace, attrname);
+ retval = solaris_save_xattrs(jcr, xattr_namespace, attrname);
/*
* The recursive call could change our working dir so change back to the wanted workdir.
jcr->last_fname, be.bstrerror());
Dmsg3(100, "Unable to fchdir to xattr space of file \"%s\" using fd %d: ERR=%s\n",
jcr->last_fname, fd, be.bstrerror());
-
goto cleanup;
}
}
cleanup:
- if (acl_text)
+ if (acl_text) {
free(acl_text);
- if (attrfd != -1)
+ }
+ if (attrfd != -1) {
close(attrfd);
-
+ }
return retval;
}
-static bool solaris_archive_xattrs(JCR *jcr, const char *xattr_namespace, const char *attr_parent)
+static bool solaris_save_xattrs(JCR *jcr, const char *xattr_namespace, const char *attr_parent)
{
const char *name;
int fd, filefd = -1, attrdirfd = -1;
DIR *dirp;
struct dirent *dp;
char current_xattr_namespace[PATH_MAX];
- bool retval = false;
+ bool retval = true; /* default non-fatal error */
/*
* Determine what argument to use. Use attr_parent when set
*/
if (attr_parent) {
name = attr_parent;
- if (xattr_namespace)
+ if (xattr_namespace) {
snprintf(current_xattr_namespace, sizeof(current_xattr_namespace), "%s%s/",
xattr_namespace, attr_parent);
- else
- strcpy(current_xattr_namespace, "/");
+ } else {
+ strncpy(current_xattr_namespace, "/", sizeof(current_xattr_namespace));
+ }
} else {
name = jcr->last_fname;
- strcpy(current_xattr_namespace, "/");
+ strncpy(current_xattr_namespace, "/", sizeof(current_xattr_namespace));
}
/*
- * Open the file on which to archive the xattrs read-only.
+ * Open the file on which to save the xattrs read-only.
*/
if ((filefd = open(name, O_RDONLY | O_NONBLOCK)) < 0) {
berrno be;
jcr->last_fname, be.bstrerror());
Dmsg2(100, "Unable to open file \"%s\": ERR=%s\n",
jcr->last_fname, be.bstrerror());
-
goto cleanup;
}
Dmsg3(100, "Unable to open xattr space %s on file \"%s\": ERR=%s\n",
name, jcr->last_fname, be.bstrerror());
}
-
goto cleanup;
}
/*
* We need to change into the attribute directory to determine if each of the
- * attributes should be archived.
+ * attributes should be saved.
*/
if (fchdir(attrdirfd) < 0) {
berrno be;
jcr->last_fname, be.bstrerror());
Dmsg3(100, "Unable to fchdir to xattr space on file \"%s\" using fd %d: ERR=%s\n",
jcr->last_fname, attrdirfd, be.bstrerror());
-
goto cleanup;
}
* And as we want this entry before anything else we better just save its data.
*/
if (!attr_parent)
- solaris_archive_xattr(jcr, attrdirfd, current_xattr_namespace, ".",
+ solaris_save_xattr(jcr, attrdirfd, current_xattr_namespace, ".",
true, STREAM_XATTR_SOLARIS);
if ((fd = dup(attrdirfd)) == -1 ||
if (!solaris_has_non_transient_extensible_attributes(filefd)) {
Dmsg3(400, "Skipping transient extensible attributes %s%s on file \"%s\"\n",
current_xattr_namespace, dp->d_name, jcr->last_fname);
-
continue;
}
/*
- * Archive the xattr.
+ * Save the xattr.
*/
- solaris_archive_xattr(jcr, attrdirfd, current_xattr_namespace, dp->d_name,
+ solaris_save_xattr(jcr, attrdirfd, current_xattr_namespace, dp->d_name,
false, STREAM_XATTR_SOLARIS_SYS);
continue;
}
#endif /* HAVE_SYS_NVPAIR_H && _PC_SATTR_ENABLED */
/*
- * Archive the xattr.
+ * Save the xattr.
*/
- solaris_archive_xattr(jcr, attrdirfd, current_xattr_namespace, dp->d_name,
+ solaris_save_xattr(jcr, attrdirfd, current_xattr_namespace, dp->d_name,
false, STREAM_XATTR_SOLARIS);
}
close(attrdirfd);
if (filefd != -1)
close(filefd);
-
return retval;
}
acl_t *aclp = NULL;
if ((error = acl_fromtext(acl_text, &aclp)) != 0) {
- return false;
+ Jmsg1(jcr, M_ERROR, 0, _("Unable to convert acl from text on file \"%s\"\n"
+ jcr->last_fname));
+ return true; /* non-fatal */
}
if ((fd != -1 && facl_set(fd, aclp) != 0) ||
attrname, jcr->last_fname, be.bstrerror());
Dmsg3(100, "Unable to restore acl of xattr %s on file \"%s\": ERR=%s\n",
attrname, jcr->last_fname, be.bstrerror());
-
- return false;
+ return true; /* non-fatal */
}
- if (aclp)
+ if (aclp) {
acl_free(aclp);
-
+ }
return true;
+
#else /* HAVE_EXTENDED_ACL */
int n;
aclent_t *acls = NULL;
attrname, jcr->last_fname, be.bstrerror());
Dmsg3(100, "Unable to restore acl of xattr %s on file \"%s\": ERR=%s\n",
attrname, jcr->last_fname, be.bstrerror());
-
- return false;
+ return true; /* non-fatal */
}
}
- if (acls)
+ if (acls) {
free(acls);
-
+ }
return true;
+
#endif /* HAVE_EXTENDED_ACL */
+
}
#endif /* HAVE_ACL */
int32_t inum;
struct stat st;
struct timeval times[2];
- bool retval = false;
+ bool retval = true; /* default non-fatal */
/*
* Parse the xattr stream. First the part that is the same for all xattrs.
jcr->last_fname, be.bstrerror());
Dmsg2(100, "Unable to open file \"%s\": ERR=%s\n",
jcr->last_fname, be.bstrerror());
-
goto cleanup;
}
jcr->last_fname, be.bstrerror());
Dmsg2(100, "Unable to open xattr space on file \"%s\": ERR=%s\n",
jcr->last_fname, be.bstrerror());
-
goto cleanup;
}
jcr->last_fname, be.bstrerror());
Dmsg3(100, "Unable to fchdir to xattr space on file \"%s\" using fd %d: ERR=%s\n",
jcr->last_fname, attrdirfd, be.bstrerror());
-
goto cleanup;
}
target_attrname, jcr->last_fname, be.bstrerror());
Dmsg3(100, "Unable to open xattr %s on file \"%s\": ERR=%s\n",
target_attrname, jcr->last_fname, be.bstrerror());
-
goto cleanup;
}
target_attrname, jcr->last_fname, be.bstrerror());
Dmsg3(100, "Unable to open xattr space %s on file \"%s\": ERR=%s\n",
target_attrname, jcr->last_fname, be.bstrerror());
-
goto cleanup;
}
target_attrname, jcr->last_fname, be.bstrerror());
Dmsg4(100, "Unable to fchdir to xattr space %s on file \"%s\" using fd %d: ERR=%s\n",
target_attrname, jcr->last_fname, attrdirfd, be.bstrerror());
-
goto cleanup;
}
target_attrname, jcr->last_fname, be.bstrerror());
Dmsg3(100, "Unable to mkfifo xattr %s on file \"%s\": ERR=%s\n",
target_attrname, jcr->last_fname, be.bstrerror());
-
- goto cleanup;
+ goto cleanup;
}
break;
case S_IFCHR:
target_attrname, jcr->last_fname, be.bstrerror());
Dmsg3(100, "Unable to mknod xattr %s on file \"%s\": ERR=%s\n",
target_attrname, jcr->last_fname, be.bstrerror());
-
goto cleanup;
}
break;
target_attrname, jcr->last_fname, be.bstrerror());
Dmsg3(100, "Unable to mkdir xattr %s on file \"%s\": ERR=%s\n",
target_attrname, jcr->last_fname, be.bstrerror());
-
goto cleanup;
}
}
target_attrname, linked_target, jcr->last_fname, be.bstrerror());
Dmsg4(100, "Unable to link xattr %s to %s on file \"%s\": ERR=%s\n",
target_attrname, linked_target, jcr->last_fname, be.bstrerror());
-
goto cleanup;
}
target_attrname, jcr->last_fname, be.bstrerror());
Dmsg3(100, "Unable to open xattr %s on file \"%s\": ERR=%s\n",
target_attrname, jcr->last_fname, be.bstrerror());
-
goto cleanup;
}
}
target_attrname, jcr->last_fname);
Dmsg2(100, "Unable to restore data of xattr %s on file \"%s\": Not all data available in xattr stream\n",
target_attrname, jcr->last_fname);
-
goto cleanup;
}
target_attrname, jcr->last_fname, be.bstrerror());
Dmsg3(100, "Unable to restore data of xattr %s on file \"%s\": ERR=%s\n",
target_attrname, jcr->last_fname, be.bstrerror());
-
goto cleanup;
}
target_attrname, linked_target, jcr->last_fname, be.bstrerror());
Dmsg4(100, "Unable to symlink xattr %s to %s on file \"%s\": ERR=%s\n",
target_attrname, linked_target, jcr->last_fname, be.bstrerror());
-
goto cleanup;
}
Dmsg3(100, "Unable to restore owner of xattr %s on file \"%s\": ERR=%s\n",
target_attrname, jcr->last_fname, be.bstrerror());
}
-
goto cleanup;
}
}
target_attrname, jcr->last_fname, be.bstrerror());
Dmsg3(100, "Unable to restore filetimes of xattr %s on file \"%s\": ERR=%s\n",
target_attrname, jcr->last_fname, be.bstrerror());
-
goto cleanup;
}
}
jcr->last_fname);
cleanup:
- if (attrfd != -1)
+ if (attrfd != -1) {
close(attrfd);
- if (attrdirfd != -1)
+ }
+ if (attrdirfd != -1) {
close(attrdirfd);
- if (filefd != -1)
+ }
+ if (filefd != -1) {
close(filefd);
-
+ }
return retval;
}
jcr->last_fname);
Dmsg1(100, "Unable to restore extensible attributes on file \"%s\", filesystem doesn't support this\n",
jcr->last_fname);
-
- return false;
+ return true;
}
is_extensible = true;
jcr->last_fname);
Dmsg1(100, "Unable to restore extended attributes on file \"%s\", filesystem doesn't support this\n",
jcr->last_fname);
-
- return false;
+ return true;
}
-
break;
default:
- return false;
+ return true;
}
/*
getcwd(cwd, sizeof(cwd));
retval = solaris_restore_xattrs(jcr, is_extensible);
chdir(cwd);
-
return retval;
}
nr_xattr_saved = 0;
/*
- * As we change the cwd in the archive function save the current cwd
- * for restore after return from the solaris_archive_xattrs function.
+ * As we change the cwd in the save function save the current cwd
+ * for restore after return from the solaris_save_xattrs function.
*/
getcwd(cwd, sizeof(cwd));
- retval = solaris_archive_xattrs(jcr, NULL, NULL);
+ retval = solaris_save_xattrs(jcr, NULL, NULL);
chdir(cwd);
-
drop_xattr_link_cache();
}
case STREAM_XATTR_SOLARIS:
return solaris_extract_xattr(jcr, stream);
default:
- return false;
+ Jmsg2(jcr, M_WARNING, 0,
+ _("Can't restore Extended Attributes of %s - incompatible xattr stream encountered - %d\n"),
+ jcr->last_fname, stream);
+ return true; /* non-fatal error */
}
}
#endif
projects / bacula / bacula / commitdiff