X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=bacula%2Fsrc%2Ffiled%2Fxattr.c;h=938f8c24c6ca86ac5f0be1f230012b27a328b7f7;hb=ed0741139e4650b4867c9bf4edaaf494aaee705f;hp=df0e0a919fe2ec2288f156fee7dd3811db9fa6f6;hpb=bbbc4771dfad256a2ad69cbf8b5914e9f99e2463;p=bacula%2Fbacula diff --git a/bacula/src/filed/xattr.c b/bacula/src/filed/xattr.c index df0e0a919f..938f8c24c6 100644 --- a/bacula/src/filed/xattr.c +++ b/bacula/src/filed/xattr.c @@ -1,7 +1,7 @@ /* 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. @@ -25,7 +25,7 @@ (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 @@ -34,9 +34,10 @@ * 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 @@ -44,16 +45,16 @@ * 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) @@ -66,7 +67,7 @@ bxattr_exit_code parse_xattr_streams(JCR *jcr, int stream) return bxattr_exit_fatal; } #else -/* +/** * Send a XATTR stream to the SD. */ static bxattr_exit_code send_xattr_stream(JCR *jcr, int stream) @@ -119,7 +120,7 @@ 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. */ @@ -149,7 +150,7 @@ static void xattr_drop_internal_table(alist *xattr_value_list) 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. * @@ -192,6 +193,11 @@ static uint32_t serialize_xattr_stream(JCR *jcr, uint32_t expected_serialize_len ser_uint32(current_xattr->value_length); if (current_xattr->value_length > 0 && current_xattr->value) { ser_bytes(current_xattr->value, current_xattr->value_length); + + Dmsg3(100, "Backup xattr named %s, value %*s\n", + current_xattr->name, current_xattr->value, current_xattr->value); + } else { + Dmsg1(100, "Backup empty xattr named %s\n", current_xattr->name); } } @@ -207,7 +213,7 @@ static bxattr_exit_code unserialize_xattr_stream(JCR *jcr, alist *xattr_value_li 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 @@ -219,7 +225,6 @@ static bxattr_exit_code unserialize_xattr_stream(JCR *jcr, alist *xattr_value_li * 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) { @@ -266,8 +271,12 @@ static bxattr_exit_code unserialize_xattr_stream(JCR *jcr, alist *xattr_value_li */ current_xattr->value = (char *)malloc(current_xattr->value_length); unser_bytes(current_xattr->value, current_xattr->value_length); + + Dmsg3(100, "Restoring xattr named %s, value %*s\n", + current_xattr->name, current_xattr->value, current_xattr->value); } else { current_xattr->value = NULL; + Dmsg1(100, "Restoring empty xattr named %s\n", current_xattr->name); } xattr_value_list->append(current_xattr); @@ -322,7 +331,7 @@ static bxattr_exit_code aix_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) 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; @@ -383,8 +392,6 @@ static bxattr_exit_code aix_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) } 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. @@ -402,6 +409,7 @@ static bxattr_exit_code aix_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) name_length = strlen(bp); if (skip_xattr || name_length == 0) { + Dmsg1(100, "Skipping xattr named %s\n", bp); bp = strchr(bp, '\0') + 1; continue; } @@ -433,16 +441,12 @@ static bxattr_exit_code aix_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) 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; @@ -465,18 +469,12 @@ static bxattr_exit_code aix_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) 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; } } @@ -492,14 +490,16 @@ static bxattr_exit_code aix_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) 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; @@ -523,19 +523,24 @@ static bxattr_exit_code aix_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) 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); } @@ -589,6 +594,303 @@ bail_out: static bxattr_exit_code (*os_build_xattr_streams)(JCR *jcr, FF_PKT *ff_pkt) = aix_xattr_build_streams; static bxattr_exit_code (*os_parse_xattr_streams)(JCR *jcr, int stream) = aix_xattr_parse_streams; +#elif defined(HAVE_IRIX_OS) + +#include + +/* + * Define the supported XATTR streams for this OS + */ +static int os_default_xattr_streams[1] = { STREAM_XATTR_IRIX }; +static const char *xattr_acl_skiplist[1] = { NULL }; +static const char *xattr_skiplist[1] = { NULL }; + +struct xattr_naming_space { + const char *name; + int flags; +}; + +static xattr_naming_space xattr_naming_spaces[] = { + { "user.", ATTR_DONTFOLLOW }, + { "root.", ATTR_ROOT | ATTR_DONTFOLLOW }, + { NULL, 0 } +}; + +static bxattr_exit_code irix_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) +{ + int cnt, length, xattr_count = 0; + 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; + + for (cnt = 0; xattr_naming_spaces[cnt].name != NULL; cnt++) { + 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) { + switch (errno) { + case ENOENT: + 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; + } + } + + 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 + */ + 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); + + expected_serialize_len += sizeof(current_xattr->name_length) + current_xattr->name_length; + + 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, + &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 + * 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, + &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; + } + } else { + current_xattr->value_length = length; + } + break; + 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; + } + } else { + current_xattr->value_length = length; + } + + expected_serialize_len += sizeof(current_xattr->value_length) + current_xattr->value_length; + + /* + * Protect ourself against things getting out of hand. + */ + 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); + 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) { + break; + } + } + } + + /* + * If we found any xattr send them to the SD. + */ + if (xattr_count > 0) { + /* + * Serialize the datastream. + */ + if (serialize_xattr_stream(jcr, expected_serialize_len, xattr_value_list) < expected_serialize_len) { + Mmsg1(jcr->errmsg, _("Failed to serialize extended attributes on file \"%s\"\n"), + jcr->last_fname); + Dmsg1(100, "Failed to serialize extended attributes on file \"%s\"\n", + jcr->last_fname); + goto bail_out; + } + + /* + * Send the datastream to the SD. + */ + retval = send_xattr_stream(jcr, os_default_xattr_streams[0]); + } else { + 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) { + xattr_drop_internal_table(xattr_value_list); + } + return retval; +} + +static bxattr_exit_code irix_xattr_parse_streams(JCR *jcr, int stream) +{ + char *bp; + 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)); + + if (unserialize_xattr_stream(jcr, xattr_value_list) != bxattr_exit_ok) { + xattr_drop_internal_table(xattr_value_list); + return bxattr_exit_error; + } + + foreach_alist(current_xattr, xattr_value_list) { + /* + * See to what namingspace this xattr belongs to. + */ + 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)) { + name_space_index = cnt; + break; + } + } + + /* + * 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"), + current_xattr->name, jcr->last_fname); + Dmsg2(100, "Received illegal xattr named %s on file \"%s\"\n", + current_xattr->name, jcr->last_fname); + 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_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_length, flags) != 0) { + switch (errno) { + case ENOENT: + retval = bxattr_exit_ok; + goto bail_out; + default: + Mmsg2(jcr->errmsg, _("attr_set error on file \"%s\": ERR=%s\n"), + jcr->last_fname, be.bstrerror()); + Dmsg2(100, "attr_set error file=%s ERR=%s\n", + jcr->last_fname, be.bstrerror()); + goto bail_out; + } + } + break; + default: + Mmsg2(jcr->errmsg, _("attr_set error on file \"%s\": ERR=%s\n"), + jcr->last_fname, be.bstrerror()); + Dmsg2(100, "attr_set error file=%s ERR=%s\n", + jcr->last_fname, be.bstrerror()); + goto bail_out; + } + } + } + + xattr_drop_internal_table(xattr_value_list); + return bxattr_exit_ok; + +bail_out: + xattr_drop_internal_table(xattr_value_list); + return bxattr_exit_error; +} + +/* + * Function pointers to the build and parse function to use for these xattrs. + */ +static bxattr_exit_code (*os_build_xattr_streams)(JCR *jcr, FF_PKT *ff_pkt) = irix_xattr_build_streams; +static bxattr_exit_code (*os_parse_xattr_streams)(JCR *jcr, int stream) = irix_xattr_parse_streams; + #elif defined(HAVE_DARWIN_OS) || \ defined(HAVE_LINUX_OS) @@ -647,10 +949,11 @@ static bxattr_exit_code generic_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) 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; @@ -663,7 +966,7 @@ static bxattr_exit_code generic_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) case -1: switch (errno) { case ENOENT: - case ENOTSUP: + case BXATTR_ENOTSUP: return bxattr_exit_ok; default: Mmsg2(jcr->errmsg, _("llistxattr error on file \"%s\": ERR=%s\n"), @@ -693,7 +996,7 @@ static bxattr_exit_code generic_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) case -1: switch (errno) { case ENOENT: - case ENOTSUP: + case BXATTR_ENOTSUP: retval = bxattr_exit_ok; goto bail_out; default: @@ -709,15 +1012,12 @@ static bxattr_exit_code generic_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) } 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; /* @@ -746,8 +1046,9 @@ static bxattr_exit_code generic_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) } } - 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; } @@ -762,7 +1063,7 @@ static bxattr_exit_code generic_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) /* * 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); @@ -776,18 +1077,14 @@ static bxattr_exit_code generic_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) case -1: switch (errno) { case ENOENT: - case ENOTSUP: + case BXATTR_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; @@ -807,20 +1104,14 @@ static bxattr_exit_code generic_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) if (xattr_value_len < 0) { switch (errno) { case ENOENT: - case ENOTSUP: + case BXATTR_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; } } @@ -836,14 +1127,16 @@ static bxattr_exit_code generic_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) 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; @@ -867,19 +1160,24 @@ static bxattr_exit_code generic_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt) 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); } @@ -906,7 +1204,7 @@ static bxattr_exit_code generic_xattr_parse_streams(JCR *jcr, int stream) if (lsetxattr(jcr->last_fname, current_xattr->name, current_xattr->value, current_xattr->value_length, 0) != 0) { switch (errno) { case ENOENT: - case ENOTSUP: + case BXATTR_ENOTSUP: goto bail_out; default: Mmsg2(jcr->errmsg, _("lsetxattr error on file \"%s\": ERR=%s\n"), @@ -967,7 +1265,7 @@ static bxattr_exit_code (*os_parse_xattr_streams)(JCR *jcr, int stream) = generi #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 }; @@ -993,31 +1291,17 @@ static bxattr_exit_code bsd_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) 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. */ 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. @@ -1037,8 +1321,6 @@ static bxattr_exit_code bsd_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) #endif case EPERM: if (attrnamespace == EXTATTR_NAMESPACE_SYSTEM) { - actuallyfree(current_attrnamespace); - current_attrnamespace = NULL; continue; } /* @@ -1087,6 +1369,18 @@ static bxattr_exit_code bsd_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) } 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. @@ -1138,6 +1432,7 @@ static bxattr_exit_code bsd_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) } if (skip_xattr) { + Dmsg1(100, "Skipping xattr named %s\n", current_attrname); continue; } @@ -1166,16 +1461,12 @@ static bxattr_exit_code bsd_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) 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; @@ -1196,18 +1487,12 @@ static bxattr_exit_code bsd_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) 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; } } @@ -1224,15 +1509,17 @@ static bxattr_exit_code bsd_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) 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++; } @@ -1265,22 +1552,27 @@ static bxattr_exit_code bsd_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) 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); } @@ -1366,7 +1658,7 @@ bail_out: 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) || \ @@ -1391,6 +1683,7 @@ static const char *xattr_skiplist[1] = { NULL }; static bxattr_exit_code tru64_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) { + int cnt; char *bp, *xattr_name, *xattr_value; @@ -1402,7 +1695,7 @@ static bxattr_exit_code tru64_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) 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; @@ -1414,14 +1707,14 @@ static bxattr_exit_code tru64_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) 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"), @@ -1433,7 +1726,7 @@ static bxattr_exit_code tru64_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) 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. */ @@ -1445,7 +1738,7 @@ static bxattr_exit_code tru64_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) 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"), @@ -1456,13 +1749,13 @@ static bxattr_exit_code tru64_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) } 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; @@ -1471,7 +1764,7 @@ static bxattr_exit_code tru64_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) /** * No xattr on file. */ - retval = bacl_exit_ok; + retval = bxattr_exit_ok; goto bail_out; } break; @@ -1479,9 +1772,7 @@ static bxattr_exit_code tru64_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) 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. */ @@ -1520,6 +1811,7 @@ static bxattr_exit_code tru64_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) } if (skip_xattr) { + Dmsg1(100, "Skipping xattr named %s\n", xattr_name); continue; } @@ -1547,13 +1839,15 @@ static bxattr_exit_code tru64_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) 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++; } @@ -1579,6 +1873,15 @@ static bxattr_exit_code tru64_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) } 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); } @@ -1593,6 +1896,7 @@ static bxattr_exit_code tru64_parse_xattr_streams(JCR *jcr, int stream) 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)); @@ -1602,7 +1906,7 @@ static bxattr_exit_code tru64_parse_xattr_streams(JCR *jcr, int stream) return bxattr_exit_error; } - /** + /* * See how big the propertylist must be. */ xattrbuf_size = 0; @@ -1612,7 +1916,7 @@ static bxattr_exit_code tru64_parse_xattr_streams(JCR *jcr, int stream) xattrbuf = (char *)malloc(xattrbuf_size); - /** + /* * Add all value pairs to the proplist. */ cnt = 0; @@ -1622,7 +1926,7 @@ static bxattr_exit_code tru64_parse_xattr_streams(JCR *jcr, int stream) current_xattr->value, &bp); } - /** + /* * Sanity check. */ if (cnt != xattrbuf_size) { @@ -1633,7 +1937,7 @@ static bxattr_exit_code tru64_parse_xattr_streams(JCR *jcr, int stream) goto bail_out; } - /** + /* * Restore the list of extended attributes on the file. */ cnt = setproplist(jcr->last_fname, 1, xattrbuf_size, xattrbuf); @@ -1641,7 +1945,7 @@ static bxattr_exit_code tru64_parse_xattr_streams(JCR *jcr, int stream) 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"), @@ -2090,7 +2394,7 @@ static bxattr_exit_code solaris_save_xattr(JCR *jcr, int fd, const char *xattr_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; @@ -2111,7 +2415,7 @@ static bxattr_exit_code solaris_save_xattr(JCR *jcr, int fd, const char *xattr_n * 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); @@ -2123,7 +2427,7 @@ static bxattr_exit_code solaris_save_xattr(JCR *jcr, int fd, const char *xattr_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); @@ -2141,7 +2445,7 @@ static bxattr_exit_code solaris_save_xattr(JCR *jcr, int fd, const char *xattr_n /* * 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); @@ -2172,7 +2476,7 @@ static bxattr_exit_code solaris_save_xattr(JCR *jcr, int fd, const char *xattr_n /* * 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); @@ -2216,7 +2520,7 @@ static bxattr_exit_code solaris_save_xattr(JCR *jcr, int fd, const char *xattr_n /* * 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); @@ -2669,7 +2973,7 @@ static bxattr_exit_code solaris_restore_xattrs(JCR *jcr, bool is_extensible) /* * Decode the attributes from the stream. */ - decode_stat(attribs, &st, &inum); + decode_stat(attribs, &st, sizeof(st), &inum); /* * Decode the next field (acl_text).