/*
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.
#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) {
* 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:
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;
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));
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;
*/
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;
#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;
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"),
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"),
* 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));
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