/*
Bacula® - The Network Backup Solution
- Copyright (C) 2008-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2008-2011 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.
(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
* - 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) {
#elif defined(HAVE_IRIX_OS)
+#include <sys/attributes.h>
+
/*
* Define the supported XATTR streams for this OS
*/
static bxattr_exit_code irix_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt)
{
- int cnt, xattr_count = 0;
+ int cnt, length, xattr_count = 0;
attrlist_cursor_t cursor;
attrlist_t *attrlist;
attrlist_ent_t *attrlist_ent;
berrno be;
for (cnt = 0; xattr_naming_spaces[cnt].name != NULL; cnt++) {
- memset(cursor, 0, sizeof(attrlist_cursor_t));
+ memset(&cursor, 0, sizeof(attrlist_cursor_t));
while (1) {
if (attr_list(jcr->last_fname, xattrbuf, ATTR_MAX_VALUELEN,
xattr_naming_spaces[cnt].flags, &cursor) != 0) {
attrlist = (attrlist_t *)xattrbuf;
- /**
+ /*
* Walk the available attributes.
*/
for (cnt = 0; cnt < attrlist->al_count; cnt++) {
attrlist_ent = ATTR_ENTRY(xattrbuf, cnt);
- /**
+ /*
* Each xattr valuepair starts with a magic so we can parse it easier.
*/
current_xattr = (xattr_t *)malloc(sizeof(xattr_t));
current_xattr->magic = XATTR_MAGIC;
expected_serialize_len += sizeof(current_xattr->magic);
- /**
+ /*
* Allocate space for storing the name.
* We store the name as <naming_space_name><xattr_name>
*/
current_xattr->value_length = attrlist_ent->a_valuelen;
current_xattr->value = (char *)malloc(current_xattr->value_length);
- /**
+ /*
* Retrieve the actual value of the xattr.
*/
if (attr_get(jcr->last_fname, attrlist_ent->a_name, current_xattr->value,
- current_xattr->value_length, xattr_naming_spaces[cnt].flags) != 0) {
+ &length, xattr_naming_spaces[cnt].flags) != 0) {
switch (errno) {
case ENOENT:
case ENOATTR:
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
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) {
+ &length, xattr_naming_spaces[cnt].flags) != 0) {
switch (errno) {
case ENOENT:
case ENOATTR:
jcr->last_fname, be.bstrerror());
goto bail_out;
}
+ } else {
+ current_xattr->value_length = length;
}
break;
default:
jcr->last_fname, be.bstrerror());
goto bail_out;
}
+ } else {
+ current_xattr->value_length = length;
}
expected_serialize_len += sizeof(current_xattr->value_length) + current_xattr->value_length;
xattr_count++;
}
- /**
+ /*
* See if there are more attributes available for a next run of attr_list.
*/
if (attrlist->al_more == 0) {
static bxattr_exit_code irix_xattr_parse_streams(JCR *jcr, int stream)
{
char *bp;
- int cnt, cmp_size, name_space_index;
+ int cnt, cmp_size, name_space_index, flags;
xattr_t *current_xattr;
alist *xattr_value_list;
+ bxattr_exit_code retval = bxattr_exit_error;
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.
*/
name_space_index = 0;
}
}
- /**
- * 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 (name_space_index == 0) {
Mmsg2(jcr->errmsg, _("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_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) {
+ current_xattr->value_length, 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_spaces[name_space_index].flags | ATTR_REPLACE;
if (attr_set(jcr->last_fname, bp, current_xattr->value,
- current_xattr->value_len, flags) != 0) {
+ current_xattr->value_length, 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;
*/
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;
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);
#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[2] = { "system.posix1e.acl_access", NULL };
+static const char *xattr_acl_skiplist[4] = { "system.posix1e.acl_access", "system.posix1e.acl_default", "system.nfs4.acl", NULL };
static const char *xattr_skiplist[1] = { NULL };
#elif defined(HAVE_NETBSD_OS)
static int os_default_xattr_streams[1] = { STREAM_XATTR_NETBSD };
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.
#endif
case EPERM:
if (attrnamespace == EXTATTR_NAMESPACE_SYSTEM) {
- actuallyfree(current_attrnamespace);
- current_attrnamespace = NULL;
continue;
}
/*
}
xattr_list[xattr_list_len] = '\0';
+ /*
+ * 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;
+ }
+
/*
* Walk the list of extended attributes names and retrieve the data.
* We already count the bytes needed for serializing the stream later on.
static bxattr_exit_code tru64_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt)
{
+ int cnt;
char *bp,
*xattr_name,
*xattr_value;
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) {
case -1:
switch (errno) {
case EOPNOTSUPP:
- retval = bacl_exit_ok;
+ retval = bxattr_exit_ok;
goto bail_out;
default:
Mmsg2(jcr->errmsg, _("getproplist error on file \"%s\": ERR=%s\n"),
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.
*/
case -1:
switch (errno) {
case EOPNOTSUPP:
- retval = bacl_exit_ok;
+ retval = bxattr_exit_ok;
goto bail_out;
default:
Mmsg2(jcr->errmsg, _("getproplist error on file \"%s\": ERR=%s\n"),
}
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
* exact moment so we can never make a good backup copy of it.
*/
- retval = bacl_exit_ok;
+ retval = bxattr_exit_ok;
goto bail_out;
default:
break;
/**
* No xattr on file.
*/
- retval = bacl_exit_ok;
+ retval = bxattr_exit_ok;
goto bail_out;
}
break;
int32_t xattrbuf_size, cnt;
xattr_t *current_xattr;
alist *xattr_value_list;
+ bxattr_exit_code retval = bxattr_exit_error;
berrno be;
xattr_value_list = New(alist(10, not_owned_by_alist));
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);
case -1:
switch (errno) {
case EOPNOTSUPP:
- retval = bacl_exit_ok;
+ retval = bxattr_exit_ok;
goto bail_out;
default:
Mmsg2(jcr->errmsg, _("setproplist error on file \"%s\": ERR=%s\n"),
* The current implementation of xattr on Solaris doesn't support this, but if it ever does we are prepared.
* Encode the stat struct into an ASCII representation.
*/
- encode_stat(attribs, &st, 0, stream);
+ encode_stat(attribs, &st, sizeof(st), 0, stream);
cnt = bsnprintf(buffer, sizeof(buffer), "%s%c%s%c%s%c",
target_attrname, 0, attribs, 0, (acl_text) ? acl_text : "", 0);
break;
* first real xattr. Encode the stat struct into an ASCII representation and jump
* out of the function.
*/
- encode_stat(attribs, &st, 0, stream);
+ encode_stat(attribs, &st, sizeof(st), 0, stream);
cnt = bsnprintf(buffer, sizeof(buffer),
"%s%c%s%c%s%c",
target_attrname, 0, attribs, 0, (acl_text) ? acl_text : "", 0);
* The current implementation of xattr on Solaris doesn't support this, but if it ever does we are prepared.
* Encode the stat struct into an ASCII representation.
*/
- encode_stat(attribs, &st, 0, stream);
+ encode_stat(attribs, &st, sizeof(st), 0, stream);
cnt = bsnprintf(buffer, sizeof(buffer),
"%s%c%s%c%s%c",
target_attrname, 0, attribs, 0, (acl_text) ? acl_text : "", 0);
/*
* Generate a xattr encoding with the reference to the target in there.
*/
- encode_stat(attribs, &st, st.st_ino, stream);
+ encode_stat(attribs, &st, sizeof(st), st.st_ino, stream);
cnt = bsnprintf(buffer, sizeof(buffer),
"%s%c%s%c%s%c",
target_attrname, 0, attribs, 0, xlce->target, 0);
/*
* Encode the stat struct into an ASCII representation.
*/
- encode_stat(attribs, &st, 0, stream);
+ encode_stat(attribs, &st, sizeof(st), 0, stream);
cnt = bsnprintf(buffer, sizeof(buffer),
"%s%c%s%c%s%c",
target_attrname, 0, attribs, 0, (acl_text) ? acl_text : "", 0);
/*
* Generate a xattr encoding with the reference to the target in there.
*/
- encode_stat(attribs, &st, st.st_ino, stream);
+ encode_stat(attribs, &st, sizeof(st), st.st_ino, stream);
cnt = bsnprintf(buffer, sizeof(buffer),
"%s%c%s%c%s%c",
target_attrname, 0, attribs, 0, link_source, 0);
/*
* Decode the attributes from the stream.
*/
- decode_stat(attribs, &st, &inum);
+ decode_stat(attribs, &st, sizeof(st), &inum);
/*
* Decode the next field (acl_text).
projects / bacula / bacula / blobdiff