/*
Bacula® - The Network Backup Solution
- Copyright (C) 2008-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2008-2010 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
* - NetBSD (Extended Attributes)
* - FreeBSD (Extended Attributes)
* - OpenBSD (Extended Attributes)
+ * (As it seems either they never implemented xattr or they are removed
+ * the support as it stated it was in version 3.1 but the current syscall
+ * tabled shows the extattr_ functions are not implemented. So as such we
+ * might eventually support xattr on OpenBSD when they implemented them using
+ * the same interface as FreeBSD and NetBSD.
* - Solaris (Extended Attributes and Extensible Attributes)
*
* Written by Marco van Wieringen, November MMVIII
if (current_xattr->value_length > 0)
free(current_xattr->value);
+
+ free(current_xattr);
}
delete xattr_value_list;
*/
bp = xattr_list;
while ((bp - xattr_list) + 1 < xattr_list_len) {
+ int name_len;
skip_xattr = false;
/*
*/
if (ff_pkt->flags & FO_ACL) {
for (cnt = 0; xattr_acl_skiplist[cnt] != NULL; cnt++) {
- if (!strcmp(bp, xattr_acl_skiplist[cnt])) {
+ if (bstrcmp(bp, xattr_acl_skiplist[cnt])) {
skip_xattr = true;
break;
}
*/
if (!skip_xattr) {
for (cnt = 0; xattr_skiplist[cnt] != NULL; cnt++) {
- if (!strcmp(bp, xattr_skiplist[cnt])) {
+ if (bstrcmp(bp, xattr_skiplist[cnt])) {
skip_xattr = true;
break;
}
}
}
- if (skip_xattr) {
+ name_len = strlen(bp);
+ if (skip_xattr || name_len == 0) {
bp = strchr(bp, '\0') + 1;
continue;
}
/*
* Allocate space for storing the name.
*/
- current_xattr->name_length = strlen(bp);
+ current_xattr->name_length = name_len;
current_xattr->name = (char *)malloc(current_xattr->name_length);
memcpy((caddr_t)current_xattr->name, (caddr_t)bp, current_xattr->name_length);
}
bail_out:
- if (xattr_list) {
+ if (xattr_list != NULL) {
free(xattr_list);
}
- if (xattr_value_list) {
+ if (xattr_value_list != NULL) {
xattr_drop_internal_table(xattr_value_list);
}
return retval;
defined(HAVE_NETBSD_OS) || \
defined(HAVE_OPENBSD_OS)
-#if !defined(HAVE_EXTATTR_GET_LINK) || \
- !defined(HAVE_EXTATTR_SET_LINK) || \
- !defined(HAVE_EXTATTR_LIST_LINK) || \
+#if (!defined(HAVE_EXTATTR_GET_LINK) && !defined(HAVE_EXTATTR_GET_FILE)) || \
+ (!defined(HAVE_EXTATTR_SET_LINK) && !defined(HAVE_EXTATTR_SET_FILE)) || \
+ (!defined(HAVE_EXTATTR_LIST_LINK) && !defined(HAVE_EXTATTR_LIST_FILE)) || \
!defined(HAVE_EXTATTR_NAMESPACE_TO_STRING) || \
!defined(HAVE_EXTATTR_STRING_TO_NAMESPACE)
#error "Missing full support for the extattr functions."
#include <libutil.h>
#endif
+#if !defined(HAVE_EXTATTR_GET_LINK) && defined(HAVE_EXTATTR_GET_FILE)
+#define extattr_get_link extattr_get_file
+#endif
+#if !defined(HAVE_EXTATTR_SET_LINK) && defined(HAVE_EXTATTR_SET_FILE)
+#define extattr_set_link extattr_set_file
+#endif
+#if !defined(HAVE_EXTATTR_LIST_LINK) && defined(HAVE_EXTATTR_LIST_FILE)
+#define extattr_list_link extattr_list_file
+#endif
+
#if defined(HAVE_FREEBSD_OS)
static int os_default_xattr_streams[1] = { STREAM_XATTR_FREEBSD };
static int os_default_xattr_namespaces[2] = { EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM };
-static const char *xattr_acl_skiplist[1] = { NULL };
+static const char *xattr_acl_skiplist[2] = { "system.posix1e.acl_access", NULL };
static const char *xattr_skiplist[1] = { NULL };
#elif defined(HAVE_NETBSD_OS)
static int os_default_xattr_streams[1] = { STREAM_XATTR_NETBSD };
uint32_t expected_serialize_len = 0;
unsigned int namespace_index;
int attrnamespace;
- char *current_attrnamespace, current_attrname[BUFSIZ], current_attrtuple[BUFSIZ];
+ char *current_attrnamespace = NULL;
+ char current_attrname[XATTR_BUFSIZ], current_attrtuple[XATTR_BUFSIZ];
xattr_t *current_xattr;
alist *xattr_value_list = NULL;
bxattr_exit_code retval = bxattr_exit_error;
for (namespace_index = 0; namespace_index < sizeof(os_default_xattr_namespaces) / sizeof(int); namespace_index++) {
attrnamespace = os_default_xattr_namespaces[namespace_index];
+ /*
+ * Convert the numeric attrnamespace into a string representation and make a private copy of that string.
+ * The extattr_namespace_to_string functions returns a strdupped string which we need to free.
+ */
+ if (extattr_namespace_to_string(attrnamespace, ¤t_attrnamespace) != 0) {
+ Mmsg2(jcr->errmsg, _("Failed to convert %d into namespace on file \"%s\"\n"),
+ attrnamespace, jcr->last_fname);
+ Dmsg2(100, "Failed to convert %d into namespace on file \"%s\"\n",
+ attrnamespace, jcr->last_fname);
+ goto bail_out;
+ }
+
/*
* First get the length of the available list with extended attributes.
+ * If we get EPERM on system namespace, don't return error.
+ * This is expected for normal users trying to archive the system
+ * namespace on FreeBSD 6.2 and later. On NetBSD 3.1 and later,
+ * they've decided to return EOPNOTSUPP instead.
*/
xattr_list_len = extattr_list_link(jcr->last_fname, attrnamespace, NULL, 0);
if (xattr_list_len < 0) {
case ENOENT:
retval = bxattr_exit_ok;
goto bail_out;
+#if defined(EOPNOTSUPP)
+ case EOPNOTSUPP:
+#endif
+ case EPERM:
+ if (attrnamespace == EXTATTR_NAMESPACE_SYSTEM) {
+ actuallyfree(current_attrnamespace);
+ current_attrnamespace = NULL;
+ continue;
+ }
+ /*
+ * FALLTHROUGH
+ */
default:
Mmsg2(jcr->errmsg, _("extattr_list_link error on file \"%s\": ERR=%s\n"),
jcr->last_fname, be.bstrerror());
*/
for (index = 0; index < xattr_list_len; index += xattr_list[index] + 1) {
skip_xattr = false;
- bsnprintf(current_attrname, sizeof(current_attrname), "%*.*s",
- xattr_list[index], xattr_list[index], xattr_list + (index + 1));
/*
- * First make a xattr tuple of the current namespace and the name of the xattr.
- * e.g. something like user.<attrname> or system.<attrname>
+ * Print the current name into the buffer as its not null terminated we need to
+ * use the length encoded in the string for copying only the needed bytes.
*/
- if (extattr_namespace_to_string(attrnamespace, ¤t_attrnamespace) != 0) {
- Mmsg2(jcr->errmsg, _("Failed to convert %d into namespace on file \"%s\"\n"),
- attrnamespace, jcr->last_fname);
- Dmsg2(100, "Failed to convert %d into namespace on file \"%s\"\n",
- attrnamespace, jcr->last_fname);
- goto bail_out;
+ cnt = xattr_list[index];
+ if (cnt > ((int)sizeof(current_attrname) - 1)) {
+ cnt = ((int)sizeof(current_attrname) - 1);
}
+ strncpy(current_attrname, xattr_list + (index + 1), cnt);
+ current_attrname[cnt] = '\0';
/*
- * print the current name into the buffer as its not null terminated we need to
- * use the length encoded in the string for copying only the needed bytes.
+ * First make a xattr tuple of the current namespace and the name of the xattr.
+ * e.g. something like user.<attrname> or system.<attrname>
*/
bsnprintf(current_attrtuple, sizeof(current_attrtuple), "%s.%s", current_attrnamespace, current_attrname);
*/
if (ff_pkt->flags & FO_ACL) {
for (cnt = 0; xattr_acl_skiplist[cnt] != NULL; cnt++) {
- if (!strcmp(current_attrtuple, xattr_acl_skiplist[cnt])) {
+ if (bstrcmp(current_attrtuple, xattr_acl_skiplist[cnt])) {
skip_xattr = true;
break;
}
*/
if (skip_xattr) {
for (cnt = 0; xattr_skiplist[cnt] != NULL; cnt++) {
- if (!strcmp(current_attrtuple, xattr_skiplist[cnt])) {
+ if (bstrcmp(current_attrtuple, xattr_skiplist[cnt])) {
skip_xattr = true;
break;
}
xattr_value_list->append(current_xattr);
xattr_count++;
+
}
+ /*
+ * Drop the local copy of the current_attrnamespace.
+ */
+ actuallyfree(current_attrnamespace);
+ current_attrnamespace = NULL;
+
/*
* We are done with this xattr list.
*/
}
bail_out:
- if (xattr_list) {
+ if (current_attrnamespace != NULL) {
+ actuallyfree(current_attrnamespace);
+ current_attrnamespace = NULL;
+ }
+ if (xattr_list != NULL) {
free(xattr_list);
}
- if (xattr_value_list) {
+ if (xattr_value_list != NULL) {
xattr_drop_internal_table(xattr_value_list);
xattr_value_list = NULL;
}
*/
cnt = extattr_set_link(jcr->last_fname, current_attrnamespace,
attrname, current_xattr->value, current_xattr->value_length);
- if (cnt < 0 || cnt != current_xattr->value_length) {
+ if (cnt < 0 || cnt != (int)current_xattr->value_length) {
switch (errno) {
case ENOENT:
goto bail_out;
#include <sys/acl.h>
#endif
-#if !defined(HAVE_OPENAT) ||
- !defined(HAVE_UNKINKAT) ||
- !defined(HAVE_FCHOWNAT) ||
+#if !defined(HAVE_OPENAT) || \
+ !defined(HAVE_UNLINKAT) || \
+ !defined(HAVE_FCHOWNAT) || \
!defined(HAVE_FUTIMESAT)
#error "Unable to compile code because of missing openat, unlinkat, fchownat or futimesat function"
#endif
char link_source[PATH_MAX];
char *acl_text = NULL;
char attribs[MAXSTRING];
- char buffer[BUFSIZ];
+ char buffer[XATTR_BUFSIZ];
bxattr_exit_code retval = bxattr_exit_error;
berrno be;
}
bail_out:
- if (acl_text) {
+ if (acl_text != NULL) {
free(acl_text);
}
if (attrfd != -1) {
/*
* Skip only the toplevel . dir.
*/
- if (!attr_parent && !strcmp(dp->d_name, "."))
+ if (!attr_parent && bstrcmp(dp->d_name, "."))
continue;
/*
* Skip all .. directories
*/
- if (!strcmp(dp->d_name, ".."))
+ if (bstrcmp(dp->d_name, ".."))
continue;
Dmsg3(400, "processing extended attribute %s%s on file \"%s\"\n",
/*
* We are not interested in read-only extensible attributes.
*/
- if (!strcmp(dp->d_name, VIEW_READONLY)) {
+ if (bstrcmp(dp->d_name, VIEW_READONLY)) {
Dmsg3(400, "Skipping readonly extensible attributes %s%s on file \"%s\"\n",
current_xattr_namespace, dp->d_name, jcr->last_fname);
* We are only interested in read-write extensible attributes
* when they contain non-transient values.
*/
- if (!strcmp(dp->d_name, VIEW_READWRITE)) {
+ if (bstrcmp(dp->d_name, VIEW_READWRITE)) {
/*
* Determine if there are non-transient system attributes at the toplevel.
* We need to provide a fd to the open file.
* If its not the hidden_dir create the entry.
* The current implementation of xattr on Solaris doesn't support this, but if it ever does we are prepared.
*/
- if (strcmp(target_attrname, ".")) {
+ if (!bstrcmp(target_attrname, ".")) {
unlinkat(attrdirfd, target_attrname, AT_REMOVEDIR);
if (mkdir(target_attrname, st.st_mode) < 0) {
Jmsg3(jcr, M_WARNING, 0, _("Unable to mkdir xattr %s on file \"%s\": ERR=%s\n"),
#if defined(HAVE_SYS_NVPAIR_H) && defined(_PC_SATTR_ENABLED)
case STREAM_XATTR_SOLARIS_SYS:
if (pathconf(jcr->last_fname, _PC_SATTR_ENABLED) <= 0) {
- Qmsg1(jcr, M_WARNING, 0,
- _("Failed to restore extensible attributes on file \"%s\"\n"),
- jcr->last_fname);
+ Mmsg1(jcr->errmsg, _("Failed to restore extensible attributes on file \"%s\"\n"), jcr->last_fname);
Dmsg1(100, "Unable to restore extensible attributes on file \"%s\", filesystem doesn't support this\n",
jcr->last_fname);
return bxattr_exit_error;
#endif
case STREAM_XATTR_SOLARIS:
if (pathconf(jcr->last_fname, _PC_XATTR_ENABLED) <= 0) {
- Qmsg1(jcr, M_WARNING, 0,
- _("Failed to restore extended attributes on file \"%s\"\n"),
- jcr->last_fname);
+ Mmsg1(jcr->errmsg, _("Failed to restore extended attributes on file \"%s\"\n"), jcr->last_fname);
Dmsg1(100, "Unable to restore extended attributes on file \"%s\", filesystem doesn't support this\n",
jcr->last_fname);
return bxattr_exit_error;
projects / bacula / bacula / blobdiff