(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
*/
-/*
+/**
* Functions to handle Extended Attributes for bacula.
*
* Extended Attributes are so OS specific we only restore Extended Attributes if
* Currently we support the following OSes:
* - AIX (Extended Attributes)
* - Darwin (Extended Attributes)
+ * - FreeBSD (Extended Attributes)
* - IRIX (Extended Attributes)
* - Linux (Extended Attributes)
* - 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
* might eventually support xattr on OpenBSD when they implemented them using
* the same interface as FreeBSD and NetBSD.
* - Solaris (Extended Attributes and Extensible Attributes)
+ * - Tru64 (Extended Attributes)
*
* Written by Marco van Wieringen, November MMVIII
- *
*/
#include "bacula.h"
#include "filed.h"
#if !defined(HAVE_XATTR)
-/*
+/**
* Entry points when compiled without support for XATTRs or on an unsupported platform.
*/
bxattr_exit_code build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt)
return bxattr_exit_fatal;
}
#else
-/*
+/**
* Send a XATTR stream to the SD.
*/
static bxattr_exit_code send_xattr_stream(JCR *jcr, int stream)
return bxattr_exit_ok;
}
-/*
+/**
* First some generic functions for OSes that use the same xattr encoding scheme.
* Currently for all OSes except for Solaris.
*/
delete xattr_value_list;
}
-/*
+/**
* The xattr stream for OSX, FreeBSD, Linux and NetBSD is a serialized stream of bytes
* which encodes one or more xattr_t structures.
*
xattr_t *current_xattr;
bxattr_exit_code retval = bxattr_exit_ok;
- /*
+ /**
* Parse the stream and call restore_xattr_on_file for each extended attribute.
*
* Start unserializing the data. We keep on looping while we have not
* First make sure the magic is present. This way we can easily catch corruption.
* Any missing MAGIC is fatal we do NOT try to continue.
*/
-
current_xattr = (xattr_t *)malloc(sizeof(xattr_t));
unser_uint32(current_xattr->magic);
if (current_xattr->magic != XATTR_MAGIC) {
int32_t xattr_list_len,
xattr_value_len;
uint32_t expected_serialize_len = 0;
- xattr_t *current_xattr;
+ xattr_t *current_xattr = NULL;
alist *xattr_value_list = NULL;
bxattr_exit_code retval = bxattr_exit_error;
berrno be;
}
xattr_list[xattr_list_len] = '\0';
- xattr_value_list = New(alist(10, not_owned_by_alist));
-
/*
* Walk the list of extended attributes names and retrieve the data.
* We already count the bytes needed for serializing the stream later on.
name_length = strlen(bp);
if (skip_xattr || name_length == 0) {
+ Dmsg1(100, "Skipping xattr named %s\n", bp);
bp = strchr(bp, '\0') + 1;
- Dmsg1(100, "Skipping xattr named %s\n", current_xattr->name);
continue;
}
case EFORMAT:
case ENOTSUP:
retval = bxattr_exit_ok;
- free(current_xattr->name);
- free(current_xattr);
goto bail_out;
default:
Mmsg2(jcr->errmsg, _("lgetea error on file \"%s\": ERR=%s\n"),
jcr->last_fname, be.bstrerror());
Dmsg2(100, "lgetea error file=%s ERR=%s\n",
jcr->last_fname, be.bstrerror());
- free(current_xattr->name);
- free(current_xattr);
goto bail_out;
}
break;
case EFORMAT:
case ENOTSUP:
retval = bxattr_exit_ok;
- free(current_xattr->value);
- free(current_xattr->name);
- free(current_xattr);
goto bail_out;
default:
Mmsg2(jcr->errmsg, _("lgetea error on file \"%s\": ERR=%s\n"),
jcr->last_fname, be.bstrerror());
Dmsg2(100, "lgetea error file=%s ERR=%s\n",
jcr->last_fname, be.bstrerror());
- free(current_xattr->value);
- free(current_xattr->name);
- free(current_xattr);
goto bail_out;
}
}
if (expected_serialize_len >= MAX_XATTR_STREAM) {
Mmsg2(jcr->errmsg, _("Xattr stream on file \"%s\" exceeds maximum size of %d bytes\n"),
jcr->last_fname, MAX_XATTR_STREAM);
- free(current_xattr->value);
- free(current_xattr->name);
- free(current_xattr);
goto bail_out;
}
}
+ if (xattr_value_list == NULL) {
+ xattr_value_list = New(alist(10, not_owned_by_alist));
+ }
+
xattr_value_list->append(current_xattr);
+ current_xattr = NULL;
xattr_count++;
bp = strchr(bp, '\0') + 1;
break;
goto bail_out;
}
- xattr_drop_internal_table(xattr_value_list);
-
/*
* Send the datastream to the SD.
*/
- return send_xattr_stream(jcr, os_default_xattr_streams[0]);
+ retval = send_xattr_stream(jcr, os_default_xattr_streams[0]);
} else {
- xattr_drop_internal_table(xattr_value_list);
-
- return bxattr_exit_ok;
+ retval = bxattr_exit_ok;
}
bail_out:
+ if (current_xattr != NULL) {
+ if (current_xattr->value != NULL) {
+ free(current_xattr->value);
+ }
+ if (current_xattr->name != NULL) {
+ free(current_xattr->name);
+ }
+ free(current_xattr);
+ }
if (xattr_list != NULL) {
free(xattr_list);
}
static bxattr_exit_code irix_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt)
{
int cnt, xattr_count = 0;
- POOLMEM *xattrbuf = get_memory(ATTR_MAX_VALUELEN);
- bxattr_exit_code retval = bxattr_exit_error;
attrlist_cursor_t cursor;
attrlist_t *attrlist;
attrlist_ent_t *attrlist_ent;
+ xattr_t *current_xattr = NULL;
alist *xattr_value_list = NULL;
+ uint32_t expected_serialize_len = 0;
+ bxattr_exit_code retval = bxattr_exit_error;
+ POOLMEM *xattrbuf = get_memory(ATTR_MAX_VALUELEN);
berrno be;
- xattr_value_list = New(alist(10, not_owned_by_alist));
-
for (cnt = 0; xattr_naming_spaces[cnt].name != NULL; cnt++) {
memset(cursor, 0, sizeof(attrlist_cursor_t));
while (1) {
attrlist = (attrlist_t *)xattrbuf;
- /**
+ /*
* Walk the available attributes.
*/
for (cnt = 0; cnt < attrlist->al_count; cnt++) {
* Allocate space for storing the name.
* We store the name as <naming_space_name><xattr_name>
*/
- current_xattr->name_length = strlen(xattr_naming_spaces[cnt].name) + strlen(attrlist_ent->a_name) + 2;
+ current_xattr->name_length = strlen(xattr_naming_spaces[cnt].name) + strlen(attrlist_ent->a_name) + 1;
current_xattr->name = (char *)malloc(current_xattr->name_length);
bsnprintf(current_xattr->name, current_xattr->name_length, "%s%s",
xattr_naming_spaces[cnt].name, attrlist_ent->a_name);
current_xattr->value_length = attrlist_ent->a_valuelen;
current_xattr->value = (char *)malloc(current_xattr->value_length);
- memset((caddr_t)current_xattr->value, 0, current_xattr->value_length);
- /**
+ /*
* Retrieve the actual value of the xattr.
*/
if (attr_get(jcr->last_fname, attrlist_ent->a_name, current_xattr->value,
switch (errno) {
case ENOENT:
case ENOATTR:
- free(current_xattr->value);
- free(current_xattr->name);
- free(current_xattr);
retval = bxattr_exit_ok;
goto bail_out;
case E2BIG:
+ /*
+ * The buffer for the xattr isn't big enough. the value of
+ * current_xattr->value_length is updated with the actual size
+ * of the xattr. So we free the old buffer and create a new one
+ * and try again.
+ */
+ free(current_xattr->value);
+ current_xattr->value = (char *)malloc(current_xattr->value_length);
+ if (attr_get(jcr->last_fname, attrlist_ent->a_name, current_xattr->value,
+ current_xattr->value_length, xattr_naming_spaces[cnt].flags) != 0) {
+ switch (errno) {
+ case ENOENT:
+ case ENOATTR:
+ retval = bxattr_exit_ok;
+ goto bail_out;
+ default:
+ Mmsg2(jcr->errmsg, _("attr_list error on file \"%s\": ERR=%s\n"),
+ jcr->last_fname, be.bstrerror());
+ Dmsg2(100, "attr_list error file=%s ERR=%s\n",
+ jcr->last_fname, be.bstrerror());
+ goto bail_out;
+ }
+ }
break;
default:
- free(current_xattr->value);
- free(current_xattr->name);
- free(current_xattr);
Mmsg2(jcr->errmsg, _("attr_list error on file \"%s\": ERR=%s\n"),
jcr->last_fname, be.bstrerror());
Dmsg2(100, "attr_list error file=%s ERR=%s\n",
goto bail_out;
}
+ if (xattr_value_list == NULL) {
+ xattr_value_list = New(alist(10, not_owned_by_alist));
+ }
+
xattr_value_list->append(current_xattr);
+ current_xattr = NULL;
xattr_count++;
}
- /**
+ /*
* See if there are more attributes available for a next run of attr_list.
*/
if (attrlist->al_more == 0) {
goto bail_out;
}
- xattr_drop_internal_table(xattr_value_list);
-
/*
* Send the datastream to the SD.
*/
- return send_xattr_stream(jcr, os_default_xattr_streams[0]);
+ retval = send_xattr_stream(jcr, os_default_xattr_streams[0]);
} else {
- xattr_drop_internal_table(xattr_value_list);
-
- return bxattr_exit_ok;
+ retval = bxattr_exit_ok;
}
bail_out:
+ if (current_xattr != NULL) {
+ if (current_xattr->value != NULL) {
+ free(current_xattr->value);
+ }
+ if (current_xattr->name != NULL) {
+ free(current_xattr->name);
+ }
+ free(current_xattr);
+ }
free_pool_memory(xattrbuf);
if (xattr_value_list != NULL) {
static bxattr_exit_code irix_xattr_parse_streams(JCR *jcr, int stream)
{
- int cnt, cmp_size;
+ char *bp;
+ int cnt, cmp_size, name_space_index;
xattr_t *current_xattr;
alist *xattr_value_list;
- xattr_naming_space *xattr_naming_space;
berrno be;
xattr_value_list = New(alist(10, not_owned_by_alist));
}
foreach_alist(current_xattr, xattr_value_list) {
- /**
+ /*
* See to what namingspace this xattr belongs to.
*/
- xattr_naming_space = NULL;
+ name_space_index = 0;
for (cnt = 0; xattr_naming_spaces[cnt].name != NULL; cnt++) {
cmp_size = strlen(xattr_naming_spaces[cnt].name);
if (!strncasecmp(current_xattr->name,
xattr_naming_spaces[cnt].name,
cmp_size)) {
- xattr_naming_space = &xattr_naming_spaces[cnt];
+ name_space_index = cnt;
break;
}
}
- /**
- * If we got a xattr that doesn't belong to ant valid namespace complain.
+ /*
+ * If we got a xattr that doesn't belong to an valid namespace complain.
*/
- if (xattr_naming_space == NULL) {
+ if (name_space_index == 0) {
Mmsg2(jcr->errmsg, _("Received illegal xattr named %s on file \"%s\"\n"),
current_xattr->name, jcr->last_fname);
Dmsg2(100, "Received illegal xattr named %s on file \"%s\"\n",
goto bail_out;
}
- /**
+ /*
* Restore the xattr first try to create the attribute from scratch.
*/
- flags = xattr_naming_space->flags | ATTR_CREATE;
- if (attr_set(jcr->last_fname, current_xattr->name,
- current_xattr->value, current_xattr->value_len, flags) != 0) {
+ flags = xattr_naming_spaces[name_space_index].flags | ATTR_CREATE;
+ bp = strchr(current_xattr->name, '.');
+ if (attr_set(jcr->last_fname, ++bp, current_xattr->value,
+ current_xattr->value_len, flags) != 0) {
switch (errno) {
case ENOENT:
retval = bxattr_exit_ok;
goto bail_out;
case EEXIST:
- /**
+ /*
* The xattr already exists we need to replace it.
*/
- flags = xattr_naming_space->flags | ATTR_REPLACE;
- if (attr_set(jcr->last_fname, current_xattr->name,
- current_xattr->value, current_xattr->value_len, flags) != 0) {
+ flags = xattr_naming_spaces[name_space_index].flags | ATTR_REPLACE;
+ if (attr_set(jcr->last_fname, bp, current_xattr->value,
+ current_xattr->value_len, flags) != 0) {
switch (errno) {
case ENOENT:
retval = bxattr_exit_ok;
bool skip_xattr;
char *xattr_list, *bp;
int cnt, xattr_count = 0;
+ uint32_t name_length;
int32_t xattr_list_len,
xattr_value_len;
uint32_t expected_serialize_len = 0;
- xattr_t *current_xattr;
+ xattr_t *current_xattr = NULL;
alist *xattr_value_list = NULL;
bxattr_exit_code retval = bxattr_exit_error;
berrno be;
}
xattr_list[xattr_list_len] = '\0';
- xattr_value_list = New(alist(10, not_owned_by_alist));
-
/*
* Walk the list of extended attributes names and retrieve the data.
* We already count the bytes needed for serializing the stream later on.
*/
bp = xattr_list;
while ((bp - xattr_list) + 1 < xattr_list_len) {
- int name_len;
skip_xattr = false;
/*
}
}
- name_len = strlen(bp);
- if (skip_xattr || name_len == 0) {
+ name_length = strlen(bp);
+ if (skip_xattr || name_length == 0) {
+ Dmsg1(100, "Skipping xattr named %s\n", bp);
bp = strchr(bp, '\0') + 1;
- Dmsg1(100, "Skipping xattr named %s\n", current_xattr->name);
continue;
}
/*
* Allocate space for storing the name.
*/
- current_xattr->name_length = name_len;
+ current_xattr->name_length = name_length;
current_xattr->name = (char *)malloc(current_xattr->name_length);
memcpy((caddr_t)current_xattr->name, (caddr_t)bp, current_xattr->name_length);
case ENOENT:
case ENOTSUP:
retval = bxattr_exit_ok;
- free(current_xattr->name);
- free(current_xattr);
goto bail_out;
default:
Mmsg2(jcr->errmsg, _("lgetxattr error on file \"%s\": ERR=%s\n"),
jcr->last_fname, be.bstrerror());
Dmsg2(100, "lgetxattr error file=%s ERR=%s\n",
jcr->last_fname, be.bstrerror());
- free(current_xattr->name);
- free(current_xattr);
goto bail_out;
}
break;
case ENOENT:
case ENOTSUP:
retval = bxattr_exit_ok;
- free(current_xattr->value);
- free(current_xattr->name);
- free(current_xattr);
goto bail_out;
default:
Mmsg2(jcr->errmsg, _("lgetxattr error on file \"%s\": ERR=%s\n"),
jcr->last_fname, be.bstrerror());
Dmsg2(100, "lgetxattr error file=%s ERR=%s\n",
jcr->last_fname, be.bstrerror());
- free(current_xattr->value);
- free(current_xattr->name);
- free(current_xattr);
goto bail_out;
}
}
if (expected_serialize_len >= MAX_XATTR_STREAM) {
Mmsg2(jcr->errmsg, _("Xattr stream on file \"%s\" exceeds maximum size of %d bytes\n"),
jcr->last_fname, MAX_XATTR_STREAM);
- free(current_xattr->value);
- free(current_xattr->name);
- free(current_xattr);
goto bail_out;
}
}
+ if (xattr_value_list == NULL) {
+ xattr_value_list = New(alist(10, not_owned_by_alist));
+ }
+
xattr_value_list->append(current_xattr);
+ current_xattr = NULL;
xattr_count++;
bp = strchr(bp, '\0') + 1;
break;
goto bail_out;
}
- xattr_drop_internal_table(xattr_value_list);
-
/*
* Send the datastream to the SD.
*/
- return send_xattr_stream(jcr, os_default_xattr_streams[0]);
+ retval = send_xattr_stream(jcr, os_default_xattr_streams[0]);
} else {
- xattr_drop_internal_table(xattr_value_list);
-
- return bxattr_exit_ok;
+ retval = bxattr_exit_ok;
}
bail_out:
+ if (current_xattr != NULL) {
+ if (current_xattr->value != NULL) {
+ free(current_xattr->value);
+ }
+ if (current_xattr->name != NULL) {
+ free(current_xattr->name);
+ }
+ free(current_xattr);
+ }
if (xattr_list != NULL) {
free(xattr_list);
}
int attrnamespace;
char *current_attrnamespace = NULL;
char current_attrname[XATTR_BUFSIZ], current_attrtuple[XATTR_BUFSIZ];
- xattr_t *current_xattr;
+ xattr_t *current_xattr = NULL;
alist *xattr_value_list = NULL;
bxattr_exit_code retval = bxattr_exit_error;
berrno be;
- xattr_value_list = New(alist(10, not_owned_by_alist));
-
/*
* Loop over all available xattr namespaces.
*/
}
if (skip_xattr) {
- Dmsg1(100, "Skipping xattr named %s\n", current_xattr->name);
+ Dmsg1(100, "Skipping xattr named %s\n", current_attrname);
continue;
}
switch (errno) {
case ENOENT:
retval = bxattr_exit_ok;
- free(current_xattr->name);
- free(current_xattr);
goto bail_out;
default:
Mmsg2(jcr->errmsg, _("extattr_get_link error on file \"%s\": ERR=%s\n"),
jcr->last_fname, be.bstrerror());
Dmsg2(100, "extattr_get_link error file=%s ERR=%s\n",
jcr->last_fname, be.bstrerror());
- free(current_xattr->name);
- free(current_xattr);
goto bail_out;
}
break;
switch (errno) {
case ENOENT:
retval = bxattr_exit_ok;
- free(current_xattr->value);
- free(current_xattr->name);
- free(current_xattr);
goto bail_out;
default:
Mmsg2(jcr->errmsg, _("extattr_get_link error on file \"%s\": ERR=%s\n"),
jcr->last_fname, be.bstrerror());
Dmsg2(100, "extattr_get_link error file=%s ERR=%s\n",
jcr->last_fname, be.bstrerror());
- free(current_xattr->value);
- free(current_xattr->name);
- free(current_xattr);
goto bail_out;
}
}
if (expected_serialize_len >= MAX_XATTR_STREAM) {
Mmsg2(jcr->errmsg, _("Xattr stream on file \"%s\" exceeds maximum size of %d bytes\n"),
jcr->last_fname, MAX_XATTR_STREAM);
- free(current_xattr->value);
- free(current_xattr->name);
- free(current_xattr);
goto bail_out;
}
break;
}
+ if (xattr_value_list == NULL) {
+ xattr_value_list = New(alist(10, not_owned_by_alist));
+ }
+
xattr_value_list->append(current_xattr);
+ current_xattr = NULL;
xattr_count++;
}
goto bail_out;
}
- xattr_drop_internal_table(xattr_value_list);
-
/*
* Send the datastream to the SD.
*/
- return send_xattr_stream(jcr, os_default_xattr_streams[0]);
+ retval = send_xattr_stream(jcr, os_default_xattr_streams[0]);
} else {
- xattr_drop_internal_table(xattr_value_list);
-
- return bxattr_exit_ok;
+ retval = bxattr_exit_ok;
}
bail_out:
if (current_attrnamespace != NULL) {
actuallyfree(current_attrnamespace);
}
+ if (current_xattr != NULL) {
+ if (current_xattr->value != NULL) {
+ free(current_xattr->value);
+ }
+ if (current_xattr->name != NULL) {
+ free(current_xattr->name);
+ }
+ free(current_xattr);
+ }
if (xattr_list != NULL) {
free(xattr_list);
}
static bxattr_exit_code (*os_build_xattr_streams)(JCR *jcr, FF_PKT *ff_pkt) = bsd_build_xattr_streams;
static bxattr_exit_code (*os_parse_xattr_streams)(JCR *jcr, int stream) = bsd_parse_xattr_streams;
-#elif defined(HAVE_TRU64_OS)
+#elif defined(HAVE_OSF1_OS)
#if !defined(HAVE_GETPROPLIST) || \
!defined(HAVE_GET_PROPLIST_ENTRY) || \
xattrbuf_size,
xattrbuf_min_size;
uint32_t expected_serialize_len = 0;
- xattr_t *current_xattr;
+ xattr_t *current_xattr = NULL;
alist *xattr_value_list = NULL;
struct proplistname_args prop_args;
bxattr_exit_code retval = bxattr_exit_error;
xattr_list_len = getproplist(jcr->last_fname, 1, &prop_args, xattrbuf_size,
xattrbuf, &xattrbuf_min_size);
- /**
+ /*
* See what xattr are available.
*/
switch (xattr_list_len) {
break;
case 0:
if (xattrbuf_min_size) {
- /**
+ /*
* The buffer isn't big enough to hold the xattr data, we now have
* a minimum buffersize so we resize the buffer and try again.
*/
}
break;
case 0:
- /**
+ /*
* This should never happen as we sized the buffer according to the minimumsize
* returned by a previous getproplist call. If it does happen things are fishy and
* we are better of forgetting this xattr as it seems its list is changing at this
break;
}
- xattr_value_list = New(alist(10, not_owned_by_alist));
-
- /**
+ /*
* Walk the list of extended attributes names and retrieve the data.
* We already count the bytes needed for serializing the stream later on.
*/
}
if (skip_xattr) {
- Dmsg1(100, "Skipping xattr named %s\n", current_xattr->name);
+ Dmsg1(100, "Skipping xattr named %s\n", xattr_name);
continue;
}
if (expected_serialize_len >= MAX_XATTR_STREAM) {
Mmsg2(jcr->errmsg, _("Xattr stream on file \"%s\" exceeds maximum size of %d bytes\n"),
jcr->last_fname, MAX_XATTR_STREAM);
- free(current_xattr->value);
- free(current_xattr->name);
- free(current_xattr);
goto bail_out;
}
+ if (xattr_value_list == NULL) {
+ xattr_value_list = New(alist(10, not_owned_by_alist));
+ }
+
xattr_value_list->append(current_xattr);
+ current_xattr = NULL;
xattr_count++;
}
}
bail_out:
+ if (current_xattr != NULL) {
+ if (current_xattr->value != NULL) {
+ free(current_xattr->value);
+ }
+ if (current_xattr->name != NULL) {
+ free(current_xattr->name);
+ }
+ free(current_xattr);
+ }
if (xattr_value_list != NULL) {
xattr_drop_internal_table(xattr_value_list);
}
return bxattr_exit_error;
}
- /**
+ /*
* See how big the propertylist must be.
*/
xattrbuf_size = 0;
xattrbuf = (char *)malloc(xattrbuf_size);
- /**
+ /*
* Add all value pairs to the proplist.
*/
cnt = 0;
current_xattr->value, &bp);
}
- /**
+ /*
* Sanity check.
*/
if (cnt != xattrbuf_size) {
goto bail_out;
}
- /**
+ /*
* Restore the list of extended attributes on the file.
*/
cnt = setproplist(jcr->last_fname, 1, xattrbuf_size, xattrbuf);
projects / bacula / bacula / blobdiff