popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
--- old/acls.c
+++ new/acls.c
-@@ -0,0 +1,1201 @@
+@@ -0,0 +1,1230 @@
+/* -*- c-file-style: "linux" -*-
+ Copyright (C) Andrew Tridgell 1996
+ Copyright (C) Paul Mackerras 1996
+} rsync_acl;
+
+static const rsync_acl rsync_acl_initializer = { 0, 0, NULL };
++static SMB_ACL_TYPE_T types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
+
+static void expand_rsync_acl(rsync_acl *racl)
+{
+ "unknown SMB_ACL_TYPE_T";
+}
+
++/*
++ * Overwrite racl with a new three-entry ACL from the given permissions.
++ */
++static void perms_to_acl(int perms, rsync_acl *racl)
++{
++ racl->count = 0;
++ expand_rsync_acl(racl);
++ racl->races[racl->count].tag_type = SMB_ACL_USER_OBJ;
++ racl->races[racl->count++].access = (perms >> 6) & 7;
++ expand_rsync_acl(racl);
++ racl->races[racl->count].tag_type = SMB_ACL_GROUP_OBJ;
++ racl->races[racl->count++].access = (perms >> 3) & 7;
++ expand_rsync_acl(racl);
++ racl->races[racl->count].tag_type = SMB_ACL_OTHER;
++ racl->races[racl->count++].access = (perms >> 0) & 7;
++}
++
+/* Generate the ACL(s) for this flist entry;
+ * ACL(s) are either sent or cleaned-up by send_acl() below. */
+
+int make_acl(const struct file_struct *file, const char *fname)
+{
-+ SMB_ACL_TYPE_T *type,
-+ types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
++ SMB_ACL_TYPE_T *type;
+ rsync_acl *curr_racl;
++
+ if (!preserve_acls || S_ISLNK(file->mode))
+ return 1;
+ for (type = &types[0], curr_racl = &_curr_rsync_acls[0];
+ SMB_ACL_T sacl;
+ BOOL ok;
+ *curr_racl = rsync_acl_initializer;
-+ if (!(sacl = sys_acl_get_file(fname, *type))) {
++ if ((sacl = sys_acl_get_file(fname, *type)) != 0) {
++ ok = unpack_smb_acl(curr_racl, sacl);
++ sys_acl_free_acl(sacl);
++ if (!ok)
++ return -1;
++ } else if (errno == ENOTSUP) {
++ /* ACLs are not supported. Invent an access ACL from
++ * permissions; let the default ACL default to empty. */
++ if (*type == SMB_ACL_TYPE_ACCESS)
++ perms_to_acl(file->mode & ACCESSPERMS, curr_racl);
++ } else {
+ rprintf(FERROR, "send_acl: sys_acl_get_file(%s, %s): %s\n",
+ fname, str_acl_type(*type), strerror(errno));
+ return -1;
+ }
-+ ok = unpack_smb_acl(curr_racl, sacl);
-+ sys_acl_free_acl(sacl);
-+ if (!ok)
-+ return -1;
+ }
+ return 0;
+}
+
+void send_acl(const struct file_struct *file, int f)
+{
-+ SMB_ACL_TYPE_T *type,
-+ types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
++ SMB_ACL_TYPE_T *type;
+ rsync_acl *curr_racl;
++
+ if (!preserve_acls || S_ISLNK(file->mode))
+ return;
+ for (type = &types[0], curr_racl = &_curr_rsync_acls[0];
+
+void receive_acl(struct file_struct *file, int f)
+{
-+ SMB_ACL_TYPE_T *type,
-+ types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
++ SMB_ACL_TYPE_T *type;
+ char *fname;
++
+ if (!preserve_acls || S_ISLNK(file->mode))
+ return;
++
+ fname = f_name(file, NULL);
+ for (type = &types[0];
+ type < &types[0] + sizeof types / sizeof types[0]
+
+void sort_file_acl_index_lists()
+{
-+ SMB_ACL_TYPE_T *type,
-+ types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
++ SMB_ACL_TYPE_T *type;
++
+ if (!preserve_acls)
+ return;
++
+ for (type = &types[0];
+ type < &types[0] + sizeof types / sizeof types[0];
-+ type++)
-+ {
++ type++) {
+ file_acl_index_list *fileaclidx_list =
+ file_acl_index_lists(*type);
+ if (!fileaclidx_list->count)
+
+int dup_acl(const char *orig, const char *bak, mode_t mode)
+{
-+ SMB_ACL_TYPE_T *type,
-+ types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
++ SMB_ACL_TYPE_T *type;
+ int ret = 0;
++
+ if (!preserve_acls)
+ return 1;
++
+ for (type = &types[0];
+ type < &types[0] + sizeof types / sizeof types[0]
+ && (*type == SMB_ACL_TYPE_ACCESS || S_ISDIR(mode));
+ const char *orig, const char *dest)
+{
+ if (preserve_acls) {
-+ SMB_ACL_TYPE_T *type,
-+ types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
++ SMB_ACL_TYPE_T *type;
+ SMB_ACL_T *sacl;
++
+ backup_orig_file = file;
+ backup_orig_fname = orig;
+ backup_dest_fname = dest;
++
+ for (type = &types[0], sacl = &_backup_sacl[0];
+ type < &types[0] + sizeof types / sizeof types[0];
+ type++) {
+static int set_keep_backup_acl()
+{
+ if (preserve_acls) {
-+ SMB_ACL_TYPE_T *type,
-+ types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
++ SMB_ACL_TYPE_T *type;
+ SMB_ACL_T *sacl;
+ int ret = 0;
++
+ for (type = &types[0], sacl = &_backup_sacl[0];
+ type < &types[0] + sizeof types / sizeof types[0];
+ type++) {
+void cleanup_keep_backup_acl()
+{
+ if (preserve_acls) {
-+ SMB_ACL_TYPE_T *type,
-+ types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
++ SMB_ACL_TYPE_T *type;
+ SMB_ACL_T *sacl;
++
+ backup_orig_file = NULL;
+ backup_orig_fname = null_string;
+ backup_dest_fname = null_string;
++
+ for (type = &types[0], sacl = &_backup_sacl[0];
+ type < &types[0] + sizeof types / sizeof types[0];
+ type++) {
+int set_acl(const char *fname, const struct file_struct *file)
+{
+ int unchanged = 1;
-+ SMB_ACL_TYPE_T *type,
-+ types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
++ SMB_ACL_TYPE_T *type;
++
+ if (dry_run || !preserve_acls || S_ISLNK(file->mode))
+ return 1;
++
+ if (file == backup_orig_file) {
+ if (!strcmp(fname, backup_dest_fname))
+ return set_keep_backup_acl();
if (daemon_chmod_modes && !S_ISLNK(flist_mode))
cur_mode = tweak_mode(cur_mode, daemon_chmod_modes);
return (flist_mode & ~CHMOD_BITS) | (cur_mode & CHMOD_BITS);
-@@ -217,6 +218,13 @@ int set_file_attrs(char *fname, struct f
+@@ -203,6 +204,13 @@ int set_file_attrs(char *fname, struct f
+ updated = 1;
}
- #endif
+#ifdef SUPPORT_ACLS
-+ /* It's fine to call set_acl() now; the generator will enable
-+ * writability on the directory using chmod if necessary. */
++ /* It's OK to call set_acl() now, even for a dir, as the generator
++ * will enable owner-writability using chmod, if necessary. */
+ if (set_acl(fname, file) == 0)
+ updated = 1;
+#endif
+
- if (verbose > 1 && flags & ATTRS_REPORT) {
- enum logcode code = daemon_log_format_has_i || dry_run
- ? FCLIENT : FINFO;
+ #ifdef HAVE_CHMOD
+ if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
+ int ret = do_chmod(fname, file->mode);
--- old/rsync.h
+++ new/rsync.h
@@ -658,6 +658,20 @@ struct chmod_mode_struct;
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff