*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2006 Wayne Davison
+ * Copyright (C) 2006-2008 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
static const char *str_acl_type(SMB_ACL_TYPE_T type)
{
- return type == SMB_ACL_TYPE_ACCESS ? "SMB_ACL_TYPE_ACCESS"
- : type == SMB_ACL_TYPE_DEFAULT ? "SMB_ACL_TYPE_DEFAULT"
- : "unknown SMB_ACL_TYPE_T";
+ switch (type) {
+ case SMB_ACL_TYPE_ACCESS:
+#ifdef HAVE_OSX_ACLS
+ return "ACL_TYPE_EXTENDED";
+#else
+ return "ACL_TYPE_ACCESS";
+#endif
+ case SMB_ACL_TYPE_DEFAULT:
+ return "ACL_TYPE_DEFAULT";
+ default:
+ break;
+ }
+ return "unknown ACL type!";
}
static int calc_sacl_entries(const rsync_acl *racl)
ida->access = access;
}
if (rc) {
- rsyserr(FERROR, errno, "unpack_smb_acl: %s()", errfun);
+ rsyserr(FERROR_XFER, errno, "unpack_smb_acl: %s()", errfun);
rsync_acl_free(racl);
return False;
}
static int store_access_in_entry(uint32 access, SMB_ACL_ENTRY_T entry)
{
if (sys_acl_set_access_bits(entry, access)) {
- rsyserr(FERROR, errno, "store_access_in_entry sys_acl_set_access_bits()");
+ rsyserr(FERROR_XFER, errno, "store_access_in_entry sys_acl_set_access_bits()");
return -1;
}
return 0;
SMB_ACL_ENTRY_T entry;
if (!(*smb_acl = sys_acl_init(calc_sacl_entries(racl)))) {
- rsyserr(FERROR, errno, "pack_smb_acl: sys_acl_init()");
+ rsyserr(FERROR_XFER, errno, "pack_smb_acl: sys_acl_init()");
return False;
}
break;
#endif
COE( sys_acl_create_entry,(smb_acl, &entry) );
- COE( sys_acl_set_info,(entry,
-#ifdef SMB_ACL_NEED_SORT
- SMB_ACL_USER,
-#else
- ida->access & NAME_IS_USER ? SMB_ACL_USER : SMB_ACL_GROUP,
-#endif
- ida->access & ~NAME_IS_USER, ida->id) );
+ COE( sys_acl_set_info,
+ (entry,
+ ida->access & NAME_IS_USER ? SMB_ACL_USER : SMB_ACL_GROUP,
+ ida->access & ~NAME_IS_USER, ida->id) );
}
#ifndef HAVE_OSX_ACLS
#ifdef DEBUG
if (sys_acl_valid(*smb_acl) < 0)
- rprintf(FERROR, "pack_smb_acl: warning: system says the ACL I packed is invalid\n");
+ rprintf(FERROR_XFER, "pack_smb_acl: warning: system says the ACL I packed is invalid\n");
#endif
return True;
error_exit:
if (errfun) {
- rsyserr(FERROR, errno, "pack_smb_acl %s()", errfun);
+ rsyserr(FERROR_XFER, errno, "pack_smb_acl %s()", errfun);
}
sys_acl_free_acl(*smb_acl);
return False;
static int get_rsync_acl(const char *fname, rsync_acl *racl,
SMB_ACL_TYPE_T type, mode_t mode)
{
- SMB_ACL_T sacl = sys_acl_get_file(fname, type);
+ SMB_ACL_T sacl;
+
+#ifdef SUPPORT_XATTRS
+ /* --fake-super support: load ACLs from an xattr. */
+ if (am_root < 0) {
+ char *buf;
+ size_t len;
+ int cnt;
+
+ if ((buf = get_xattr_acl(fname, type == SMB_ACL_TYPE_ACCESS, &len)) == NULL)
+ return 0;
+ cnt = (len - 4*4) / (4+4);
+ if (len < 4*4 || len != (size_t)cnt*(4+4) + 4*4) {
+ free(buf);
+ return -1;
+ }
+
+ racl->user_obj = IVAL(buf, 0);
+ racl->group_obj = IVAL(buf, 4);
+ racl->mask_obj = IVAL(buf, 8);
+ racl->other_obj = IVAL(buf, 12);
+
+ if (cnt) {
+ char *bp = buf + 4*4;
+ id_access *ida;
+ if (!(ida = racl->names.idas = new_array(id_access, cnt)))
+ out_of_memory("get_rsync_acl");
+ racl->names.count = cnt;
+ for ( ; cnt--; ida++, bp += 4+4) {
+ ida->id = IVAL(bp, 0);
+ ida->access = IVAL(bp, 4);
+ }
+ }
+ free(buf);
+ return 0;
+ }
+#endif
- if (sacl) {
+ if ((sacl = sys_acl_get_file(fname, type)) != 0) {
BOOL ok = unpack_smb_acl(sacl, racl);
sys_acl_free_acl(sacl);
if (type == SMB_ACL_TYPE_ACCESS)
rsync_acl_fake_perms(racl, mode);
} else {
- rsyserr(FERROR, errno, "get_acl: sys_acl_get_file(%s, %s)",
+ rsyserr(FERROR_XFER, errno, "get_acl: sys_acl_get_file(%s, %s)",
fname, str_acl_type(type));
return -1;
}
for (ida = idal->idas; count--; ida++) {
uint32 xbits = ida->access << 2;
- char *name;
+ const char *name;
if (ida->access & NAME_IS_USER) {
xbits |= XFLAG_NAME_IS_USER;
name = add_uid(ida->id);
if (name_follows_ptr) {
int flags = access & 3;
access >>= 2;
- if (access & ~SMB_ACL_VALID_NAME_BITS)
+ if (am_root >= 0 && access & ~SMB_ACL_VALID_NAME_BITS)
goto value_error;
if (flags & XFLAG_NAME_FOLLOWS)
*name_follows_ptr = 1;
*name_follows_ptr = 0;
if (flags & XFLAG_NAME_IS_USER)
access |= NAME_IS_USER;
- } else if (access & ~SMB_ACL_VALID_OBJ_BITS) {
+ } else if (am_root >= 0 && access & ~SMB_ACL_VALID_OBJ_BITS) {
value_error:
- rprintf(FERROR, "recv_acl_access: value out of range: %x\n",
+ rprintf(FERROR_XFER, "recv_acl_access: value out of range: %x\n",
access);
exit_cleanup(RERR_STREAMIO);
}
int ndx = read_varint(f);
if (ndx < 0 || (size_t)ndx > racl_list->count) {
- rprintf(FERROR, "recv_acl_index: %s ACL index %d > %d\n",
+ rprintf(FERROR_XFER, "recv_acl_index: %s ACL index %d > %d\n",
str_acl_type(type), ndx, (int)racl_list->count);
exit_cleanup(RERR_STREAMIO);
}
if (flags & XMIT_NAME_LIST)
computed_mask_bits |= recv_ida_entries(&duo_item->racl.names, f);
+#ifdef HAVE_OSX_ACLS
+ /* If we received a superfluous mask, throw it away. */
+ duo_item->racl.mask_obj = NO_ENTRY;
+#else
if (!duo_item->racl.names.count) {
/* If we received a superfluous mask, throw it away. */
if (duo_item->racl.mask_obj != NO_ENTRY) {
duo_item->racl.group_obj &= duo_item->racl.mask_obj | NO_ENTRY;
duo_item->racl.mask_obj = NO_ENTRY;
}
- }
-#ifndef HAVE_OSX_ACLS
- else if (duo_item->racl.mask_obj == NO_ENTRY) /* Must be non-empty with lists. */
+ } else if (duo_item->racl.mask_obj == NO_ENTRY) /* Must be non-empty with lists. */
duo_item->racl.mask_obj = (computed_mask_bits | duo_item->racl.group_obj) & ~NO_ENTRY;
#endif
if (rc) {
error_exit:
if (errfun) {
- rsyserr(FERROR, errno, "change_sacl_perms: %s()",
+ rsyserr(FERROR_XFER, errno, "change_sacl_perms: %s()",
errfun);
}
return (mode_t)~0;
{
if (type == SMB_ACL_TYPE_DEFAULT
&& duo_item->racl.user_obj == NO_ENTRY) {
- if (sys_acl_delete_def_file(fname) < 0) {
- rsyserr(FERROR, errno, "set_acl: sys_acl_delete_def_file(%s)",
+ int rc;
+#ifdef SUPPORT_XATTRS
+ /* --fake-super support: delete default ACL from xattrs. */
+ if (am_root < 0)
+ rc = del_def_xattr_acl(fname);
+ else
+#endif
+ rc = sys_acl_delete_def_file(fname);
+ if (rc < 0) {
+ rsyserr(FERROR_XFER, errno, "set_acl: sys_acl_delete_def_file(%s)",
fname);
return -1;
}
+#ifdef SUPPORT_XATTRS
+ } else if (am_root < 0) {
+ /* --fake-super support: store ACLs in an xattr. */
+ int cnt = duo_item->racl.names.count;
+ size_t len = 4*4 + cnt * (4+4);
+ char *buf = new_array(char, len);
+ int rc;
+
+ SIVAL(buf, 0, duo_item->racl.user_obj);
+ SIVAL(buf, 4, duo_item->racl.group_obj);
+ SIVAL(buf, 8, duo_item->racl.mask_obj);
+ SIVAL(buf, 12, duo_item->racl.other_obj);
+
+ if (cnt) {
+ char *bp = buf + 4*4;
+ id_access *ida = duo_item->racl.names.idas;
+ for ( ; cnt--; ida++, bp += 4+4) {
+ SIVAL(bp, 0, ida->id);
+ SIVAL(bp, 4, ida->access);
+ }
+ }
+ rc = set_xattr_acl(fname, type == SMB_ACL_TYPE_ACCESS, buf, len);
+ free(buf);
+ return rc;
+#endif
} else {
mode_t cur_mode = sxp->st.st_mode;
if (!duo_item->sacl
}
#endif
if (sys_acl_set_file(fname, type, duo_item->sacl) < 0) {
- rsyserr(FERROR, errno, "set_acl: sys_acl_set_file(%s, %s)",
- fname, str_acl_type(type));
+ rsyserr(FERROR_XFER, errno, "set_acl: sys_acl_set_file(%s, %s)",
+ fname, str_acl_type(type));
return -1;
}
if (type == SMB_ACL_TYPE_ACCESS)
}
/* Otherwise fall through. */
default:
- rprintf(FERROR, "default_perms_for_dir: sys_acl_get_file(%s, %s): %s, falling back on umask\n",
+ rprintf(FWARNING,
+ "default_perms_for_dir: sys_acl_get_file(%s, %s): %s, falling back on umask\n",
dir, str_acl_type(SMB_ACL_TYPE_DEFAULT), strerror(errno));
}
return perms;
ok = unpack_smb_acl(sacl, &racl);
sys_acl_free_acl(sacl);
if (!ok) {
- rprintf(FERROR, "default_perms_for_dir: unpack_smb_acl failed, falling back on umask\n");
+ rprintf(FWARNING, "default_perms_for_dir: unpack_smb_acl failed, falling back on umask\n");
return perms;
}