autoconf
autoheader
- ./configure --with-acl-support
+ ./configure --enable-acl-support
make proto
make
notice that no ACLs are available to copy. Of course, trying to write out
ACLs to a non-ACL-supporting disk should complain.
---- orig/Makefile.in 2004-11-03 11:56:03
-+++ Makefile.in 2004-10-20 06:32:26
-@@ -25,16 +25,16 @@ VERSION=@VERSION@
+--- orig/Makefile.in 2006-01-14 08:14:29
++++ Makefile.in 2005-11-07 04:31:05
+@@ -25,15 +25,15 @@ VERSION=@VERSION@
.SUFFIXES:
.SUFFIXES: .c .o
LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
- lib/permstring.o lib/pool_alloc.o @LIBOBJS@
+ lib/permstring.o lib/pool_alloc.o lib/sysacls.o @LIBOBJS@
- ZLIBOBJ=zlib/deflate.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
- zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
- zlib/zutil.o zlib/adler32.o
+ ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
+ zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
main.o checksum.o match.o syscall.o log.o backup.o
OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
-- fileio.o batch.o clientname.o
-+ fileio.o batch.o clientname.o acls.o
+- fileio.o batch.o clientname.o chmod.o
++ fileio.o batch.o clientname.o chmod.o acls.o
OBJS3=progress.o pipe.o
DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
---- orig/acls.c 2004-10-20 06:36:04
-+++ acls.c 2004-10-20 06:36:04
-@@ -0,0 +1,1130 @@
+--- orig/acls.c 2006-01-31 19:25:53
++++ acls.c 2006-01-31 19:25:53
+@@ -0,0 +1,1202 @@
+/* -*- c-file-style: "linux" -*-
+ Copyright (C) Andrew Tridgell 1996
+ Copyright (C) Paul Mackerras 1996
+#include "rsync.h"
+#include "lib/sysacls.h"
+
-+#if SUPPORT_ACLS
++#ifdef SUPPORT_ACLS
+
+extern int preserve_acls;
+extern int am_root;
+extern int dry_run;
++extern int orig_umask;
+
+typedef struct {
+ id_t id;
+
+static void expand_rsync_acl(rsync_acl *racl)
+{
-+ /* first time through, 0 <= 0, so list is expanded:
-+ * diabolical, rsync guys! */
++ /* First time through, 0 <= 0, so list is expanded.
++ * (Diabolical, rsync guys!) */
+ if (racl->malloced <= racl->count) {
+ rsync_ace *new_ptr;
+ size_t new_size = racl->malloced + 10;
+
+static void expand_rsync_acl_list(rsync_acl_list *racl_list)
+{
-+ /* first time through, 0 <= 0, so list is expanded:
-+ * diabolical, rsync guys! */
++ /* First time through, 0 <= 0, so list is expanded.
++ * (Diabolical, rsync guys!) */
+ if (racl_list->malloced <= racl_list->count) {
+ rsync_acl *new_ptr;
+ size_t new_size;
+#if 0
+static void free_rsync_acl_list(rsync_acl_list *racl_list)
+{
-+ /* run this in reverse, so references are freed before referents, */
-+ /* although not currently necessary */
++ /* Run this in reverse, so references are freed before referents,
++ * although not currently necessary. */
+ while (racl_list->count--) {
+ rsync_acl *racl = &racl_list->racls[racl_list->count];
+ if (racl)
+ int *match = (type == SMB_ACL_TYPE_ACCESS) ?
+ &access_match : &default_match;
+ size_t count = racl_list->count;
-+ /* if this is the first time through or we didn't match the last
++ /* If this is the first time through or we didn't match the last
+ * time, then start at the end of the list, which should be the
-+ * best place to start hunting */
++ * best place to start hunting. */
+ if (*match == -1)
+ *match = racl_list->count - 1;
+ while (count--) {
+ return *match;
+}
+
-+/* the general strategy with the tag_type <-> character mapping is that
++/* The general strategy with the tag_type <-> character mapping is that
+ * lowercase implies that no qualifier follows, where uppercase does.
-+ * same sorta thing for the acl type (access or default) itself, but
++ * A similar idiom for the acl type (access or default) itself, but
+ * lowercase in this instance means there's no ACL following, so the
+ * ACL is a repeat, so the receiver should reuse the last of the same
-+ * type ACL */
++ * type ACL. */
+
+static void send_rsync_acl(int f, const rsync_acl *racl)
+{
+ write_byte(f, race->access);
+ if (isupper((int)ch)) {
+ write_int(f, race->id);
-+ /* FIXME: sorta wasteful. we should maybe buffer as
++ /* FIXME: sorta wasteful: we should maybe buffer as
+ * many ids as max(ACL_USER + ACL_GROUP) objects to
-+ * keep from making so many calls */
++ * keep from making so many calls. */
+ if (ch == 'U')
+ add_uid(race->id);
+ else
+ "unknown SMB_ACL_TYPE_T";
+}
+
-+/* generate the ACL(s) for this flist entry;
-+ * ACL(s) are either sent or cleaned-up by send_acl() below */
++/* Generate the ACL(s) for this flist entry;
++ * ACL(s) are either sent or cleaned-up by send_acl() below. */
+
-+BOOL make_acl(const struct file_struct *file, const char *fname)
++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};
+ rsync_acl *curr_racl;
+ if (!preserve_acls || S_ISLNK(file->mode))
-+ return True;
++ return 1;
+ for (type = &types[0], curr_racl = &_curr_rsync_acls[0];
+ type < &types[0] + sizeof types / sizeof types[0]
+ && (*type == SMB_ACL_TYPE_ACCESS || S_ISDIR(file->mode));
+ if (!(sacl = sys_acl_get_file(fname, *type))) {
+ rprintf(FERROR, "send_acl: sys_acl_get_file(%s, %s): %s\n",
+ fname, str_acl_type(*type), strerror(errno));
-+ return False;
++ return -1;
+ }
+ ok = unpack_smb_acl(curr_racl, sacl);
+ sys_acl_free_acl(sacl);
+ if (!ok)
-+ return False;
++ return -1;
+ }
-+ return True;
++ return 0;
+}
+
-+/* send the make_acl()-generated ACLs for this flist entry,
-+ * or clean up after an flist entry that's not being sent (f == -1) */
++/* Send the make_acl()-generated ACLs for this flist entry,
++ * or clean up after an flist entry that's not being sent (f == -1). */
+
+void send_acl(const struct file_struct *file, int f)
+{
+ }
+}
+
-+/* the below stuff is only used by the receiver */
++/* The below stuff is only used by the receiver: */
+
+/* structure to hold index to rsync_acl_list member corresponding to
+ * flist->files[i] */
+
+static void expand_file_acl_index_list(file_acl_index_list *fileaclidx_list)
+{
-+ /* first time through, 0 <= 0, so list is expanded:
-+ * diabolical, rsync guys! */
++ /* First time through, 0 <= 0, so list is expanded.
++ * (Diabolical, rsync guys!) */
+ if (fileaclidx_list->malloced <= fileaclidx_list->count) {
+ file_acl_index *new_ptr;
+ size_t new_size;
+
+static void expand_smb_acl_list(smb_acl_list *sacl_list)
+{
-+ /* first time through, 0 <= 0, so list is expanded:
-+ * diabolical, rsync guys! */
++ /* First time through, 0 <= 0, so list is expanded.
++ * (Diabolical, rsync guys!) */
+ if (sacl_list->malloced <= sacl_list->count) {
+ SMB_ACL_T *new_ptr;
+ size_t new_size;
+ char *fname;
+ if (!preserve_acls || S_ISLNK(file->mode))
+ return;
-+ fname = f_name(file);
++ fname = f_name(file, NULL);
+ for (type = &types[0];
+ type < &types[0] + sizeof types / sizeof types[0]
+ && (*type == SMB_ACL_TYPE_ACCESS || S_ISDIR(file->mode));
+ types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
+ int ret = 0;
+ if (!preserve_acls)
-+ return 0;
++ return 1;
+ for (type = &types[0];
+ type < &types[0] + sizeof types / sizeof types[0]
+ && (*type == SMB_ACL_TYPE_ACCESS || S_ISDIR(mode));
+ return ret;
+}
+
-+/* stuff for redirecting calls to set_acl() from set_perms()
-+ * for keep_backup() */
++/* Stuff for redirecting calls to set_acl() from set_file_attrs()
++ * for keep_backup(). */
+static const struct file_struct *backup_orig_file = NULL;
+static const char null_string[] = "";
+static const char *backup_orig_fname = null_string;
+ }
+ return ret;
+ }
-+ return 0;
++ return 1;
+}
+
+void cleanup_keep_backup_acl()
+ SMB_ACL_TYPE_T *type,
+ types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
+ if (dry_run || !preserve_acls || S_ISLNK(file->mode))
-+ return 0;
++ return 1;
+ if (file == backup_orig_file) {
+ if (!strcmp(fname, backup_dest_fname))
+ return set_keep_backup_acl();
+ return updated;
+}
+
-+/* enumeration functions for uid mapping */
++/* Enumeration functions for uid mapping: */
+
-+/* context -- one and only one. should be cycled through once on uid mapping
-+ * and once on gid mapping */
++/* Context -- one and only one. Should be cycled through once on uid
++ * mapping and once on gid mapping. */
+static rsync_acl_list *_enum_racl_lists[] = {
+ &_rsync_acl_lists[0], &_rsync_acl_lists[1], NULL
+};
+static size_t enum_racl_index = 0;
+static size_t enum_race_index = 0;
+
-+/* this returns the next tag_type id from the given acl for the next entry,
-+ * or it returns 0 if there are no more tag_type ids in the acl */
++/* This returns the next tag_type id from the given acl for the next entry,
++ * or it returns 0 if there are no more tag_type ids in the acl. */
+
+static id_t next_ace_id(SMB_ACL_TAG_T tag_type, const rsync_acl *racl)
+{
+ set_acl_id(gid);
+}
+
++#define PERMS_SPLICE(perms,newbits,where) (((perms) & ~(7 << (where))) | ((newbits) << (where)))
++
++int default_perms_for_dir(const char *dir)
++{
++ rsync_acl racl;
++ SMB_ACL_T sacl;
++ BOOL ok, saw_mask = False;
++ size_t i;
++ int perms;
++
++ if (dir == NULL)
++ dir = ".";
++ perms = ACCESSPERMS & ~orig_umask;
++ /* Read the directory's default ACL. If it has none, this will successfully return an empty ACL. */
++ sacl = sys_acl_get_file(dir, SMB_ACL_TYPE_DEFAULT);
++ if (sacl == NULL) {
++ /* Couldn't get an ACL. Darn. */
++ switch (errno) {
++ case ENOTSUP:
++ /* ACLs are disabled. We could yell at the user to turn them on, but... */
++ break;
++ case ENOENT:
++ if (dry_run) {
++ /* We're doing a dry run, so the containing directory
++ * wasn't actually created. Don't worry about it. */
++ break;
++ }
++ /* Otherwise fall through. */
++ default:
++ rprintf(FERROR, "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;
++ }
++
++ /* Convert it. */
++ ok = unpack_smb_acl(&racl, sacl);
++ sys_acl_free_acl(sacl);
++ if (!ok) {
++ rprintf(FERROR, "default_perms_for_dir: unpack_smb_acl failed, falling back on umask\n");
++ return perms;
++ }
++
++ /* Look at each default ACL entry and possibly modify three bits of `perms' accordingly.
++ * If there's "no" default ACL, there will be zero entries and the umask-based perms is unchanged. */
++ for (i = 0; i < racl.count; i++) {
++ switch (racl.races[i].tag_type) {
++ case SMB_ACL_USER_OBJ:
++ perms = PERMS_SPLICE(perms, racl.races[i].access, 6);
++ break;
++ case SMB_ACL_GROUP_OBJ:
++ if (!saw_mask)
++ perms = PERMS_SPLICE(perms, racl.races[i].access, 3);
++ break;
++ case SMB_ACL_MASK:
++ saw_mask = True;
++ perms = PERMS_SPLICE(perms, racl.races[i].access, 3);
++ break;
++ case SMB_ACL_OTHER:
++ perms = PERMS_SPLICE(perms, racl.races[i].access, 0);
++ break;
++ default:
++ break;
++ }
++ }
++ rsync_acl_free(&racl);
++ if (verbose > 2)
++ rprintf(FINFO, "got ACL-based default perms %o for directory %s\n", perms, dir);
++ return perms;
++}
++
+#endif /* SUPPORT_ACLS */
---- orig/backup.c 2005-02-14 02:45:09
+--- orig/backup.c 2006-01-30 07:18:27
+++ backup.c 2004-10-06 00:13:09
-@@ -121,6 +121,7 @@ static int make_bak_dir(char *fullpath)
+@@ -135,6 +135,7 @@ static int make_bak_dir(char *fullpath)
} else {
do_lchown(fullpath, st.st_uid, st.st_gid);
do_chmod(fullpath, st.st_mode);
}
}
*p = '/';
-@@ -173,6 +174,8 @@ static int keep_backup(char *fname)
+@@ -188,6 +189,8 @@ static int keep_backup(char *fname)
if (!(buf = get_backup_name(fname)))
return 0;
+ PUSH_KEEP_BACKUP_ACL(file, fname, buf);
+
/* Check to see if this is a device file, or link */
- if (IS_DEVICE(file->mode)) {
- if (am_root && preserve_devices) {
-@@ -246,6 +249,7 @@ static int keep_backup(char *fname)
+ if ((am_root && preserve_devices && IS_DEVICE(file->mode))
+ || (preserve_specials && IS_SPECIAL(file->mode))) {
+@@ -263,6 +266,7 @@ static int keep_backup(char *fname)
}
}
- set_perms(buf, file, NULL, 0);
+ set_file_attrs(buf, file, NULL, 0);
+ CLEANUP_KEEP_BACKUP_ACL();
free(file);
if (verbose > 1) {
---- orig/configure.in 2005-01-28 23:01:08
+--- orig/configure.in 2006-01-15 14:52:33
+++ configure.in 2004-08-19 19:53:27
-@@ -467,6 +467,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
+@@ -478,6 +478,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
AC_CHECK_LIB(resolv, strcasecmp)
fi
dnl At the moment we don't test for a broken memcmp(), because all we
dnl need to do is test for equality, not comparison, and it seems that
dnl every platform has a memcmp that can do at least that.
-@@ -713,6 +718,77 @@ AC_SUBST(OBJ_RESTORE)
+@@ -750,6 +755,77 @@ AC_SUBST(OBJ_RESTORE)
AC_SUBST(CC_SHOBJ_FLAG)
AC_SUBST(BUILD_POPT)
+# check for ACL support
+
+AC_MSG_CHECKING(whether to support ACLs)
-+AC_ARG_WITH(acl-support,
-+[ --with-acl-support Include ACL support (default=no)],
-+[ case "$withval" in
++AC_ARG_ENABLE(acl-support,
++AC_HELP_STRING([--enable-acl-support], [Include ACL support (default=no)]),
++[ case "$enableval" in
+ yes)
+
+ case "$host_os" in
AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
AC_OUTPUT
---- orig/flist.c 2005-02-14 02:45:10
-+++ flist.c 2005-02-14 02:45:34
-@@ -978,6 +978,8 @@ void send_file_name(int f, struct file_l
- file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS);
+--- orig/flist.c 2006-01-31 02:30:18
++++ flist.c 2006-01-31 02:37:33
+@@ -967,6 +967,8 @@ static struct file_struct *send_file_nam
+ f == -2 ? SERVER_FILTERS : ALL_FILTERS);
if (!file)
- return;
-+ if (!MAKE_ACL(file, fname))
-+ return;
-
- maybe_emit_filelist_progress(flist);
+ return NULL;
++ if (MAKE_ACL(file, fname) < 0)
++ return NULL;
-@@ -986,6 +988,10 @@ void send_file_name(int f, struct file_l
+ if (chmod_modes && !S_ISLNK(file->mode))
+ file->mode = tweak_mode(file->mode, chmod_modes);
+@@ -978,6 +980,10 @@ static struct file_struct *send_file_nam
if (file->basename[0]) {
flist->files[flist->count++] = file;
- send_file_entry(file, f, base_flags);
+ send_file_entry(file, f);
+ SEND_ACL(file, f);
+ } else {
+ /* Cleanup unsent ACL(s). */
+ SEND_ACL(file, -1);
}
-
- if (recursive && S_ISDIR(file->mode)
-@@ -1296,6 +1302,8 @@ struct file_list *recv_file_list(int f)
+ return file;
+ }
+@@ -1366,6 +1372,8 @@ struct file_list *recv_file_list(int f)
flags |= read_byte(f) << 8;
file = receive_file_entry(flist, flags, f);
if (S_ISREG(file->mode))
stats.total_size += file->length;
-@@ -1318,6 +1326,8 @@ struct file_list *recv_file_list(int f)
+@@ -1388,6 +1396,8 @@ struct file_list *recv_file_list(int f)
clean_flist(flist, relative_paths, 1);
+ SORT_FILE_ACL_INDEX_LISTS();
+
if (f >= 0) {
- /* Now send the uid/gid list. This was introduced in
- * protocol version 15 */
---- orig/generator.c 2005-02-18 20:17:34
-+++ generator.c 2005-01-30 10:09:44
-@@ -451,6 +451,10 @@ static void recv_generator(char *fname,
- if (set_perms(fname, file, statret ? NULL : &st, 0)
- && verbose && protocol_version < 29 && f_out != -1)
- rprintf(FINFO, "%s/\n", safe_fname(fname));
-+#if SUPPORT_ACLS
+ recv_uid_list(f, flist);
+
+--- orig/generator.c 2006-01-31 18:59:39
++++ generator.c 2006-01-31 19:36:04
+@@ -42,6 +42,7 @@ extern int preserve_specials;
+ extern int preserve_hard_links;
+ extern int preserve_perms;
+ extern int preserve_executability;
++extern int preserve_acls;
+ extern int preserve_uid;
+ extern int preserve_gid;
+ extern int preserve_times;
+@@ -756,6 +757,7 @@ static int try_dests_non(struct file_str
+ }
+
+ static int phase = 0;
++static int dflt_perms;
+
+ /* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir,
+ * make sure it exists, and has the right permissions/timestamp info. For
+@@ -772,7 +774,7 @@ static void recv_generator(char *fname,
+ enum logcode code, int f_out)
+ {
+ static int missing_below = -1, excluded_below = -1;
+- static char *fuzzy_dirname = "";
++ static char *parent_dirname = "";
+ static struct file_list *fuzzy_dirlist = NULL;
+ struct file_struct *fuzzy_file = NULL;
+ int fd = -1, f_copy = -1;
+@@ -791,12 +793,12 @@ static void recv_generator(char *fname,
+ if (fuzzy_dirlist) {
+ flist_free(fuzzy_dirlist);
+ fuzzy_dirlist = NULL;
+- fuzzy_dirname = "";
+ }
+ if (missing_below >= 0) {
+ dry_run--;
+ missing_below = -1;
+ }
++ parent_dirname = "";
+ return;
+ }
+
+@@ -831,15 +833,20 @@ static void recv_generator(char *fname,
+ statret = -1;
+ stat_errno = ENOENT;
+ } else {
+- if (fuzzy_basis && S_ISREG(file->mode)) {
++ if ((fuzzy_basis || preserve_acls) && S_ISREG(file->mode)) {
+ char *dn = file->dirname ? file->dirname : ".";
+- if (fuzzy_dirname != dn
+- && strcmp(fuzzy_dirname, dn) != 0) {
++ if (parent_dirname != dn
++ && strcmp(parent_dirname, dn) != 0) {
+ if (fuzzy_dirlist)
+ flist_free(fuzzy_dirlist);
+- fuzzy_dirlist = get_dirlist(dn, -1, 1);
++ if (fuzzy_basis)
++ fuzzy_dirlist = get_dirlist(dn, -1, 1);
++#ifdef SUPPORT_ACLS
++ if (preserve_acls)
++ dflt_perms = default_perms_for_dir(dn);
++#endif
+ }
+- fuzzy_dirname = dn;
++ parent_dirname = dn;
+ }
+
+ statret = link_stat(fname, &st,
+@@ -861,7 +868,8 @@ static void recv_generator(char *fname,
+ if (!preserve_perms) {
+ int exists = statret == 0
+ && S_ISDIR(st.st_mode) == S_ISDIR(file->mode);
+- file->mode = dest_mode(file->mode, st.st_mode, exists);
++ file->mode = dest_mode(file->mode, st.st_mode, dflt_perms,
++ exists);
+ }
+
+ if (S_ISDIR(file->mode)) {
+@@ -895,6 +903,10 @@ static void recv_generator(char *fname,
+ if (set_file_attrs(fname, file, statret ? NULL : &st, 0)
+ && verbose && code && f_out != -1)
+ rprintf(code, "%s/\n", fname);
++#ifdef SUPPORT_ACLS
+ if (f_out == -1)
+ SET_ACL(fname, file);
+#endif
- if (delete_during && f_out != -1 && csum_length != SUM_LENGTH
+ if (delete_during && f_out != -1 && !phase && dry_run < 2
&& (file->flags & FLAG_DEL_HERE))
- delete_in_dir(flist, fname, file);
---- orig/lib/sysacls.c 2004-10-20 15:35:58
-+++ lib/sysacls.c 2004-10-20 15:35:58
-@@ -0,0 +1,3217 @@
+ delete_in_dir(the_file_list, fname, file, &st);
+@@ -1330,6 +1342,8 @@ void generate_files(int f_out, struct fi
+ * notice that and let us know via the redo pipe (or its closing). */
+ ignore_timeout = 1;
+
++ dflt_perms = (ACCESSPERMS & ~orig_umask);
++
+ for (i = 0; i < flist->count; i++) {
+ struct file_struct *file = flist->files[i];
+
+--- orig/lib/sysacls.c 2005-05-16 23:27:53
++++ lib/sysacls.c 2005-05-16 23:27:53
+@@ -0,0 +1,3242 @@
+/*
+ Unix SMB/CIFS implementation.
+ Samba system utilities for ACL support.
+*/
+
+#include "rsync.h"
-+#include "sysacls.h"
++#include "sysacls.h" /****** ADDED ******/
+
++/****** EXTRAS -- THESE ITEMS ARE NOT FROM THE SAMBA SOURCE ******/
+void SAFE_FREE(void *mem)
+{
+ if (mem)
+ }
+ return pw->pw_name;
+}
++/****** EXTRAS -- END ******/
+
+/*
+ This file wraps all differing system ACL interfaces into a consistent
+ return acl_free(the_acl);
+}
+
-+int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
++int sys_acl_free_qualifier(void *qual, UNUSED(SMB_ACL_TAG_T tagtype))
+{
+ return acl_free(qual);
+}
+ */
+ len = 0;
+ maxlen = 20 * acl_d->count;
-+ if ((text = malloc(maxlen)) == NULL) {
++ if ((text = SMB_MALLOC(maxlen)) == NULL) {
+ errno = ENOMEM;
+ return NULL;
+ }
+
+ maxlen += nbytes + 20 * (acl_d->count - i);
+
-+ if ((text = Realloc(oldtext, maxlen)) == NULL) {
++ if ((text = SMB_REALLOC(oldtext, maxlen)) == NULL) {
+ SAFE_FREE(oldtext);
+ errno = ENOMEM;
+ return NULL;
+ * acl[] array, this actually allocates an ACL with room
+ * for (count+1) entries
+ */
-+ if ((a = malloc(sizeof(*a) + count * sizeof(struct acl))) == NULL) {
++ if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + count * sizeof(struct acl))) == NULL) {
+ errno = ENOMEM;
+ return NULL;
+ }
+ * allocate a temporary buffer for the complete ACL
+ */
+ acl_count = acc_acl->count + def_acl->count;
-+ acl_p = acl_buf = malloc(acl_count * sizeof(acl_buf[0]));
++ acl_p = acl_buf = SMB_MALLOC_ARRAY(struct acl, acl_count);
+
+ if (acl_buf == NULL) {
+ sys_acl_free_acl(tmp_acl);
+ */
+ len = 0;
+ maxlen = 20 * acl_d->count;
-+ if ((text = malloc(maxlen)) == NULL) {
++ if ((text = SMB_MALLOC(maxlen)) == NULL) {
+ errno = ENOMEM;
+ return NULL;
+ }
+
+ maxlen += nbytes + 20 * (acl_d->count - i);
+
-+ if ((text = Realloc(oldtext, maxlen)) == NULL) {
++ if ((text = SMB_REALLOC(oldtext, maxlen)) == NULL) {
+ free(oldtext);
+ errno = ENOMEM;
+ return NULL;
+ * acl[] array, this actually allocates an ACL with room
+ * for (count+1) entries
+ */
-+ if ((a = malloc(sizeof(*a) + count * sizeof(struct acl))) == NULL) {
++ if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + count * sizeof(struct acl))) == NULL) {
+ errno = ENOMEM;
+ return NULL;
+ }
+ * allocate a temporary buffer for the complete ACL
+ */
+ acl_count = acc_acl->count + def_acl->count;
-+ acl_p = acl_buf = malloc(acl_count * sizeof(acl_buf[0]));
++ acl_p = acl_buf = SMB_MALLOC_ARRAY(struct acl, acl_count);
+
+ if (acl_buf == NULL) {
+ sys_acl_free_acl(tmp_acl);
+{
+ SMB_ACL_T a;
+
-+ if ((a = malloc(sizeof(*a))) == NULL) {
++ if ((a = SMB_MALLOC_P(struct SMB_ACL_T)) == NULL) {
+ errno = ENOMEM;
+ return NULL;
+ }
+{
+ SMB_ACL_T a;
+
-+ if ((a = malloc(sizeof(*a))) == NULL) {
++ if ((a = SMB_MALLOC_P(struct SMB_ACL_T)) == NULL) {
+ errno = ENOMEM;
+ return NULL;
+ }
+ return NULL;
+ }
+
-+ if ((a = malloc(sizeof(*a) + sizeof(struct acl))) == NULL) {
++ if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + sizeof(struct acl))) == NULL) {
+ errno = ENOMEM;
+ return NULL;
+ }
+ int rc = 0;
+ uid_t user_id;
+
++ /* AIX has no DEFAULT */
++ if ( type == SMB_ACL_TYPE_DEFAULT )
++ return NULL;
++
+ /* Get the acl using statacl */
+
+ DEBUG(10,("Entering sys_acl_get_file\n"));
+ DEBUG(10,("path_p is %s\n",path_p));
+
-+ file_acl = (struct acl *)malloc(BUFSIZ);
++ file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
+
+ if(file_acl == NULL) {
+ errno=ENOMEM;
+ if(acl_entry_link_head == NULL)
+ return(NULL);
+
-+ acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof(struct new_acl_entry));
++ acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
+ if(acl_entry_link->entryp == NULL) {
+ SAFE_FREE(file_acl);
+ errno = ENOMEM;
+ * and already has entryp allocated. */
+
+ if(acl_entry_link_head->count != 0) {
-+ acl_entry_link->nextp = (struct acl_entry_link *)
-+ malloc(sizeof(struct acl_entry_link));
++ acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
+
+ if(acl_entry_link->nextp == NULL) {
+ SAFE_FREE(file_acl);
+
+ acl_entry_link->nextp->prevp = acl_entry_link;
+ acl_entry_link = acl_entry_link->nextp;
-+ acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof(struct new_acl_entry));
++ acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
+ if(acl_entry_link->entryp == NULL) {
+ SAFE_FREE(file_acl);
+ errno = ENOMEM;
+ for( i = 1; i < 4; i++) {
+ DEBUG(10,("i is %d\n",i));
+ if(acl_entry_link_head->count != 0) {
-+ acl_entry_link->nextp = (struct acl_entry_link *)malloc(sizeof(struct acl_entry_link));
++ acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
+ if(acl_entry_link->nextp == NULL) {
+ SAFE_FREE(file_acl);
+ errno = ENOMEM;
+
+ acl_entry_link->nextp->prevp = acl_entry_link;
+ acl_entry_link = acl_entry_link->nextp;
-+ acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof(struct new_acl_entry));
++ acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
+ if(acl_entry_link->entryp == NULL) {
+ SAFE_FREE(file_acl);
+ errno = ENOMEM;
+
+ DEBUG(10,("Entering sys_acl_get_fd\n"));
+ DEBUG(10,("fd is %d\n",fd));
-+ file_acl = (struct acl *)malloc(BUFSIZ);
++ file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
+
+ if(file_acl == NULL) {
+ errno=ENOMEM;
+ return(NULL);
+ }
+
-+ acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof(struct new_acl_entry));
++ acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
+
+ if(acl_entry_link->entryp == NULL) {
+ errno = ENOMEM;
+ * and already has entryp allocated. */
+
+ if(acl_entry_link_head->count != 0) {
-+ acl_entry_link->nextp = (struct acl_entry_link *)malloc(sizeof(struct acl_entry_link));
++ acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
+ if(acl_entry_link->nextp == NULL) {
+ errno = ENOMEM;
+ DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
+ }
+ acl_entry_link->nextp->prevp = acl_entry_link;
+ acl_entry_link = acl_entry_link->nextp;
-+ acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof(struct new_acl_entry));
++ acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
+ if(acl_entry_link->entryp == NULL) {
+ errno = ENOMEM;
+ DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
+ for( i = 1; i < 4; i++) {
+ DEBUG(10,("i is %d\n",i));
+ if(acl_entry_link_head->count != 0){
-+ acl_entry_link->nextp = (struct acl_entry_link *)malloc(sizeof(struct acl_entry_link));
++ acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
+ if(acl_entry_link->nextp == NULL) {
+ errno = ENOMEM;
+ DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
+
+ acl_entry_link->nextp->prevp = acl_entry_link;
+ acl_entry_link = acl_entry_link->nextp;
-+ acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof(struct new_acl_entry));
++ acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
+
+ if(acl_entry_link->entryp == NULL) {
+ SAFE_FREE(file_acl);
+
+ DEBUG(10,("Entering sys_acl_init\n"));
+
-+ theacl = (struct acl_entry_link *)malloc(sizeof(struct acl_entry_link));
++ theacl = SMB_MALLOC_P(struct acl_entry_link);
+ if(theacl == NULL) {
+ errno = ENOMEM;
+ DEBUG(0,("Error in sys_acl_init is %d\n",errno));
+ }
+
+ if(theacl->count != 0){
-+ temp_entry->nextp = acl_entryp = (struct acl_entry_link *)malloc(sizeof(struct acl_entry_link));
++ temp_entry->nextp = acl_entryp = SMB_MALLOC_P(struct acl_entry_link);
+ if(acl_entryp == NULL) {
+ errno = ENOMEM;
+ DEBUG(0,("Error in sys_acl_create_entry is %d\n",errno));
+ DEBUG(10,("The acl_entryp->prevp is %d\n",acl_entryp->prevp));
+ }
+
-+ *pentry = acl_entryp->entryp = (struct new_acl_entry *)malloc(sizeof(struct new_acl_entry));
++ *pentry = acl_entryp->entryp = SMB_MALLOC_P(struct new_acl_entry);
+ if(*pentry == NULL) {
+ errno = ENOMEM;
+ DEBUG(0,("Error in sys_acl_create_entry is %d\n",errno));
+ return(0);
+
+ acl_length = BUFSIZ;
-+ file_acl = (struct acl *)malloc(BUFSIZ);
++ file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
+
+ if(file_acl == NULL) {
+ errno = ENOMEM;
+
+ if((file_acl->acl_len + sizeof(struct acl_entry)) > acl_length) {
+ acl_length += sizeof(struct acl_entry);
-+ file_acl_temp = (struct acl *)malloc(acl_length);
++ file_acl_temp = (struct acl *)SMB_MALLOC(acl_length);
+ if(file_acl_temp == NULL) {
+ SAFE_FREE(file_acl);
+ errno = ENOMEM;
+
+ DEBUG(10,("Entering sys_acl_set_fd\n"));
+ acl_length = BUFSIZ;
-+ file_acl = (struct acl *)malloc(BUFSIZ);
++ file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
+
+ if(file_acl == NULL) {
+ errno = ENOMEM;
+
+ if((file_acl->acl_len + sizeof(struct acl_entry)) > acl_length) {
+ acl_length += sizeof(struct acl_entry);
-+ file_acl_temp = (struct acl *)malloc(acl_length);
++ file_acl_temp = (struct acl *)SMB_MALLOC(acl_length);
+ if(file_acl_temp == NULL) {
+ SAFE_FREE(file_acl);
+ errno = ENOMEM;
+
+#else /* No ACLs. */
+
-+int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
++int sys_acl_get_entry(UNUSED(SMB_ACL_T the_acl), UNUSED(int entry_id), UNUSED(SMB_ACL_ENTRY_T *entry_p))
+{
+ errno = ENOSYS;
+ return -1;
+}
+
-+int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
++int sys_acl_get_tag_type(UNUSED(SMB_ACL_ENTRY_T entry_d), UNUSED(SMB_ACL_TAG_T *tag_type_p))
+{
+ errno = ENOSYS;
+ return -1;
+}
+
-+int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
++int sys_acl_get_permset(UNUSED(SMB_ACL_ENTRY_T entry_d), UNUSED(SMB_ACL_PERMSET_T *permset_p))
+{
+ errno = ENOSYS;
+ return -1;
+}
+
-+void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
++void *sys_acl_get_qualifier(UNUSED(SMB_ACL_ENTRY_T entry_d))
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
-+SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
++SMB_ACL_T sys_acl_get_file(UNUSED(const char *path_p), UNUSED(SMB_ACL_TYPE_T type))
+{
+ errno = ENOSYS;
+ return (SMB_ACL_T)NULL;
+}
+
-+SMB_ACL_T sys_acl_get_fd(int fd)
++SMB_ACL_T sys_acl_get_fd(UNUSED(int fd))
+{
+ errno = ENOSYS;
+ return (SMB_ACL_T)NULL;
+}
+
-+int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
++int sys_acl_clear_perms(UNUSED(SMB_ACL_PERMSET_T permset))
+{
+ errno = ENOSYS;
+ return -1;
+}
+
-+int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
++int sys_acl_add_perm( UNUSED(SMB_ACL_PERMSET_T permset), UNUSED(SMB_ACL_PERM_T perm))
+{
+ errno = ENOSYS;
+ return -1;
+ return (permset & perm) ? 1 : 0;
+}
+
-+char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen)
++char *sys_acl_to_text(UNUSED(SMB_ACL_T the_acl), UNUSED(ssize_t *plen))
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
-+int sys_acl_free_text(char *text)
++int sys_acl_free_text(UNUSED(char *text))
+{
+ errno = ENOSYS;
+ return -1;
+}
+
-+SMB_ACL_T sys_acl_init( int count)
++SMB_ACL_T sys_acl_init(UNUSED(int count))
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
-+int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
++int sys_acl_create_entry(UNUSED(SMB_ACL_T *pacl), UNUSED(SMB_ACL_ENTRY_T *pentry))
+{
+ errno = ENOSYS;
+ return -1;
+}
+
-+int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
++int sys_acl_set_tag_type(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(SMB_ACL_TAG_T tagtype))
+{
+ errno = ENOSYS;
+ return -1;
+}
+
-+int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
++int sys_acl_set_qualifier(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(void *qual))
+{
+ errno = ENOSYS;
+ return -1;
+}
+
-+int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
++int sys_acl_set_permset(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(SMB_ACL_PERMSET_T permset))
+{
+ errno = ENOSYS;
+ return -1;
+}
+
-+int sys_acl_valid( SMB_ACL_T theacl )
++int sys_acl_valid(UNUSED(SMB_ACL_T theacl))
+{
+ errno = ENOSYS;
+ return -1;
+}
+
-+int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
++int sys_acl_set_file(UNUSED(const char *name), UNUSED(SMB_ACL_TYPE_T acltype), UNUSED(SMB_ACL_T theacl))
+{
+ errno = ENOSYS;
+ return -1;
+}
+
-+int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
++int sys_acl_set_fd(UNUSED(int fd), UNUSED(SMB_ACL_T theacl))
+{
+ errno = ENOSYS;
+ return -1;
+}
+
-+int sys_acl_delete_def_file(const char *name)
++int sys_acl_delete_def_file(UNUSED(const char *name))
+{
+ errno = ENOSYS;
+ return -1;
+}
+
-+int sys_acl_free_acl(SMB_ACL_T the_acl)
++int sys_acl_free_acl(UNUSED(SMB_ACL_T the_acl))
+{
+ errno = ENOSYS;
+ return -1;
+}
+
-+int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
++int sys_acl_free_qualifier(UNUSED(void *qual), UNUSED(SMB_ACL_TAG_T tagtype))
+{
+ errno = ENOSYS;
+ return -1;
+}
+
+#endif /* No ACLs. */
---- orig/lib/sysacls.h 2004-10-20 15:31:22
-+++ lib/sysacls.h 2004-10-20 15:31:22
-@@ -0,0 +1,25 @@
-+#define Realloc(mem, cnt) realloc_array((mem), char, (cnt))
++
++/************************************************************************
++ Deliberately outside the ACL defines. Return 1 if this is a "no acls"
++ errno, 0 if not.
++************************************************************************/
++
++int no_acl_syscall_error(int err)
++{
++#if defined(ENOSYS)
++ if (err == ENOSYS) {
++ return 1;
++ }
++#endif
++#if defined(ENOTSUP)
++ if (err == ENOTSUP) {
++ return 1;
++ }
++#endif
++ return 0;
++}
+--- orig/lib/sysacls.h 2005-05-16 23:25:51
++++ lib/sysacls.h 2005-05-16 23:25:51
+@@ -0,0 +1,28 @@
++#define SMB_MALLOC(cnt) new_array(char, cnt)
++#define SMB_MALLOC_P(obj) new_array(obj, 1)
++#define SMB_MALLOC_ARRAY(obj, cnt) new_array(obj, cnt)
++#define SMB_REALLOC(mem, cnt) realloc_array(mem, char, cnt)
+#define slprintf snprintf
+
+int sys_acl_get_entry(SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p);
+int sys_acl_free_text(char *text);
+int sys_acl_free_acl(SMB_ACL_T the_acl);
+int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype);
---- orig/mkproto.awk 2005-02-18 20:17:35
+--- orig/mkproto.awk 2005-02-18 20:16:59
+++ mkproto.awk 2005-02-18 20:18:17
@@ -58,7 +58,7 @@ BEGIN {
next;
next;
}
---- orig/options.c 2005-02-18 18:02:45
-+++ options.c 2005-02-14 02:46:05
+--- orig/options.c 2006-01-31 03:11:30
++++ options.c 2006-01-31 03:11:18
@@ -44,6 +44,7 @@ int keep_dirlinks = 0;
int copy_links = 0;
int preserve_links = 0;
int preserve_hard_links = 0;
+int preserve_acls = 0;
int preserve_perms = 0;
+ int preserve_executability = 0;
int preserve_devices = 0;
- int preserve_uid = 0;
-@@ -169,6 +170,7 @@ static void print_rsync_version(enum log
+@@ -193,6 +194,7 @@ static void print_rsync_version(enum log
char const *got_socketpair = "no ";
char const *have_inplace = "no ";
char const *hardlinks = "no ";
char const *links = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
-@@ -185,6 +187,10 @@ static void print_rsync_version(enum log
+@@ -209,6 +211,10 @@ static void print_rsync_version(enum log
hardlinks = "";
#endif
#ifdef SUPPORT_LINKS
links = "";
#endif
-@@ -199,9 +205,9 @@ static void print_rsync_version(enum log
- "Copyright (C) 1996-2005 by Andrew Tridgell and others\n");
+@@ -222,9 +228,9 @@ static void print_rsync_version(enum log
+ rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
rprintf(f, "<http://rsync.samba.org/>\n");
rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
- "%shard links, %ssymlinks, batchfiles, \n",
/* Note that this field may not have type ino_t. It depends
* on the complicated interaction between largefile feature
-@@ -271,6 +277,7 @@ void usage(enum logcode F)
- rprintf(F," -H, --hard-links preserve hard links\n");
+@@ -293,6 +299,7 @@ void usage(enum logcode F)
rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
rprintf(F," -p, --perms preserve permissions\n");
+ rprintf(F," -E, --executability preserve the file's executability\n");
+ rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
- rprintf(F," -o, --owner preserve owner (root only)\n");
+ rprintf(F," --chmod=CHMOD change destination permissions\n");
+ rprintf(F," -o, --owner preserve owner (super-user only)\n");
rprintf(F," -g, --group preserve group\n");
- rprintf(F," -D, --devices preserve devices (root only)\n");
-@@ -392,6 +399,7 @@ static struct poptOption long_options[]
- {"no-whole-file", 0, POPT_ARG_VAL, &whole_file, 0, 0, 0 },
- {"copy-unsafe-links",0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 },
- {"perms", 'p', POPT_ARG_NONE, &preserve_perms, 0, 0, 0 },
-+ {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
- {"owner", 'o', POPT_ARG_NONE, &preserve_uid, 0, 0, 0 },
- {"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 },
- {"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
-@@ -837,6 +845,24 @@ int parse_arguments(int *argc, const cha
- basis_dir[basis_dir_cnt++] = (char *)arg;
- break;
+@@ -409,6 +416,9 @@ static struct poptOption long_options[]
+ {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
+ {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
+ {"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
++ {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
++ {"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
++ {"no-A", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
+ {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
+ {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
+ {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
+@@ -1057,6 +1067,24 @@ int parse_arguments(int *argc, const cha
+ usage(FINFO);
+ exit_cleanup(0);
+ case 'A':
-+#if SUPPORT_ACLS
++#ifdef SUPPORT_ACLS
+ preserve_acls = 1;
+ preserve_perms = 1;
++ break;
+#else
+ /* FIXME: this should probably be ignored with a
+ * warning and then countermeasures taken to
+ am_server ? "server" : "client");
+ return 0;
+#endif /* SUPPORT_ACLS */
-+ break;
+
+
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1226,6 +1252,8 @@ void server_options(char **args,int *arg
+@@ -1497,6 +1525,8 @@ void server_options(char **args,int *arg
if (preserve_hard_links)
argstr[x++] = 'H';
if (preserve_uid)
argstr[x++] = 'o';
if (preserve_gid)
---- orig/rsync.c 2005-02-14 02:45:10
-+++ rsync.c 2004-07-03 20:11:58
-@@ -238,6 +238,14 @@ int set_perms(char *fname,struct file_st
+--- orig/receiver.c 2006-01-31 02:30:18
++++ receiver.c 2006-01-31 19:36:48
+@@ -37,6 +37,7 @@ extern int relative_paths;
+ extern int keep_dirlinks;
+ extern int preserve_hard_links;
+ extern int preserve_perms;
++extern int preserve_acls;
+ extern int io_error;
+ extern int basis_dir_cnt;
+ extern int make_backups;
+@@ -410,6 +411,8 @@ int recv_files(int f_in, struct file_lis
+ int itemizing = am_daemon ? daemon_log_format_has_i
+ : !am_server && log_format_has_i;
+ int max_phase = protocol_version >= 29 ? 2 : 1;
++ int dflt_perms = (ACCESSPERMS & ~orig_umask);
++ char *parent_dirname = "";
+ int i, recv_ok;
+
+ if (verbose > 2)
+@@ -607,7 +610,18 @@ int recv_files(int f_in, struct file_lis
+ * mode based on the local permissions and some heuristics. */
+ if (!preserve_perms) {
+ int exists = fd1 != -1;
+- file->mode = dest_mode(file->mode, st.st_mode, exists);
++#ifdef SUPPORT_ACLS
++ if (preserve_acls) {
++ char *dn = file->dirname ? file->dirname : ".";
++ if (parent_dirname != dn
++ && strcmp(parent_dirname, dn) != 0) {
++ dflt_perms = default_perms_for_dir(dn);
++ parent_dirname = dn;
++ }
++ }
++#endif
++ file->mode = dest_mode(file->mode, st.st_mode,
++ dflt_perms, exists);
+ }
+
+ /* We now check to see if we are writing file "inplace" */
+--- orig/rsync.c 2006-01-31 02:30:18
++++ rsync.c 2006-01-31 19:35:44
+@@ -53,7 +53,8 @@ void free_sums(struct sum_struct *s)
+
+ /* This is only called when we aren't preserving permissions. Figure out what
+ * the permissions should be and return them merged back into the mode. */
+-mode_t dest_mode(mode_t flist_mode, mode_t dest_mode, int exists)
++mode_t dest_mode(mode_t flist_mode, mode_t dest_mode, int dflt_perms,
++ int exists)
+ {
+ /* If the file already exists we'll return the local permissions,
+ * possibly tweaked by the --executability option. */
+@@ -68,7 +69,7 @@ mode_t dest_mode(mode_t flist_mode, mode
+ dest_mode |= (dest_mode & 0444) >> 2;
+ }
+ } else
+- dest_mode = flist_mode & ~orig_umask;
++ dest_mode = ((flist_mode & CHMOD_BITS) & dflt_perms) | S_IWUSR;
+ return (flist_mode & ~CHMOD_BITS) | (dest_mode & CHMOD_BITS);
+ }
+
+@@ -161,6 +162,14 @@ int set_file_attrs(char *fname, struct f
}
#endif
+ /* If this is a directory, SET_ACL() will be called on the cleanup
-+ * receive_generator() pass--if we called it here, we might clobber
-+ * writability on the directory. everything else is OK to do now. */
++ * receive_generator() pass (if we called it here, we might clobber
++ * writability on the directory). Everything else is OK to do now. */
+ if (!S_ISDIR(st->st_mode)) {
+ if (SET_ACL(fname, file) == 0)
+ updated = 1;
+ }
+
- if (verbose > 1 && flags & PERMS_REPORT) {
- if (updated)
- rprintf(FINFO, "%s\n", safe_fname(fname));
---- orig/rsync.h 2005-02-16 17:08:13
-+++ rsync.h 2004-07-03 20:11:58
-@@ -625,6 +625,40 @@ struct stats {
+ if (verbose > 1 && flags & ATTRS_REPORT) {
+ enum logcode code = daemon_log_format_has_i || dry_run
+ ? FCLIENT : FINFO;
+--- orig/rsync.h 2006-01-30 20:39:09
++++ rsync.h 2006-01-31 19:27:00
+@@ -648,6 +648,44 @@ struct chmod_mode_struct;
#include "lib/permstring.h"
#include "lib/addrinfo.h"
-+#define SUPPORT_ACLS HAVE_POSIX_ACLS|HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|\
-+ HAVE_HPUX_ACLS|HAVE_IRIX_ACLS|HAVE_AIX_ACLS|HAVE_TRU64_ACLS
++#if HAVE_POSIX_ACLS|HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|\
++ HAVE_HPUX_ACLS|HAVE_IRIX_ACLS|HAVE_AIX_ACLS|HAVE_TRU64_ACLS
++#define SUPPORT_ACLS 1
++#endif
+
-+#define ACLS_NEED_MASK HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|HAVE_HPUX_ACLS
++#if HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|HAVE_HPUX_ACLS
++#define ACLS_NEED_MASK 1
++#endif
+
-+#if SUPPORT_ACLS
-+#if HAVE_SYS_ACL_H
++#ifdef SUPPORT_ACLS
++#ifdef HAVE_SYS_ACL_H
+#include <sys/acl.h>
+#endif
+#define MAKE_ACL(file, fname) make_acl(file, fname)
+#define SEND_ACL(file, f)
+#define RECEIVE_ACL(file, f)
+#define SORT_FILE_ACL_INDEX_LISTS()
-+#define SET_ACL(fname, file) 0 /* checked return value */
++#define SET_ACL(fname, file) 1 /* checked return value */
+#define NEXT_ACL_UID()
+#define ACL_UID_MAP(uid)
+#define PUSH_KEEP_BACKUP_ACL(file, orig, dest)
+#define CLEANUP_KEEP_BACKUP_ACL()
-+#define DUP_ACL(src, orig, mode) 0 /* checked return value */
++#define DUP_ACL(src, orig, mode) 1 /* checked return value */
+#endif /* SUPPORT_ACLS */
+#include "smb_acls.h"
+
#include "proto.h"
/* We have replacement versions of these if they're missing. */
---- orig/rsync.yo 2005-02-18 20:17:35
-+++ rsync.yo 2004-07-03 20:11:58
+--- orig/rsync.yo 2006-01-31 03:05:44
++++ rsync.yo 2006-01-31 03:14:05
@@ -317,6 +317,7 @@ to the detailed description below for a
- -H, --hard-links preserve hard links
-K, --keep-dirlinks treat symlinked dir on receiver as dir
-p, --perms preserve permissions
-+ -A, --acls preserve ACLs (implies -p) [local option]
- -o, --owner preserve owner (root only)
+ -E, --executability preserve executability
++ -A, --acls preserve ACLs (implies -p) [non-standard]
+ --chmod=CHMOD change destination permissions
+ -o, --owner preserve owner (super-user only)
-g, --group preserve group
- -D, --devices preserve devices (root only)
-@@ -624,6 +625,11 @@ source file's permissions and the umask
- other files (including updated files) retain their existing permissions
- (which is the same behavior as other file-copy utilities, such as cp).
+@@ -691,14 +692,23 @@ quote(itemize(
+ permissions, though the bf(--executability) option might change just
+ the execute permission for the file.
+ it() Each new file gets its permissions set based on the source file's
+- permissions, but masked by the receiving end's umask setting (including
++ permissions, but masked by the receiving end's destination-default
++ permissions (which is either based on the ACL of the destination
++ directory, if available, or the receiving end's umask setting) and
++ includes
+ the stripping of the three special permission bits).
++ Hint: Using bf(--chmod=ugo=rwX) without bf(--perms) will cause new
++ files to get all the destination-default permissions.
+ ))
+
+ Thus, when bf(--perms) and bf(--executability) are both disabled,
+ rsync's behavior is the same as that of other file-copy utilities,
+ such as bf(cp)(1) and bf(tar)(1).
+
++This version of rsync observes default ACLs; patched versions of rsync only
++applied the umask, and could thus set wrong permissions in the presence of
++default ACLs.
++
+ dit(bf(-E, --executability)) This option causes rsync to preserve the
+ executability (or non-executability) of regular files when bf(--perms) is
+ not enabled. A regular file is considered to be executable if at least one
+@@ -713,6 +723,10 @@ quote(itemize(
+
+ If bf(--perms) is enabled, this option is ignored.
+
++dit(bf(-A, --acls)) This option causes rsync to update the destination
++ACLs to be the same as the source ACLs. This nonstandard option only
++works if the remote rsync also supports it. bf(--acls) implies bf(--perms).
++
+ dit(bf(--chmod)) This option tells rsync to apply one or more
+ comma-separated "chmod" strings to the permission of the files in the
+ transfer. The resulting value is treated as though it was the permissions
+--- orig/runtests.sh 2005-08-17 06:45:08
++++ runtests.sh 2006-01-31 19:09:40
+@@ -195,6 +195,9 @@ export scratchdir suitedir
+ prep_scratch() {
+ [ -d "$scratchdir" ] && rm -rf "$scratchdir"
+ mkdir "$scratchdir"
++ # Get rid of default ACLs and directory setgid because they confuse some tests.
++ setfacl -k "$scratchdir" 2>/dev/null || true
++ chmod g-s "$scratchdir"
+ return 0
+ }
-+dit(bf(-A, --acls)) This option causes rsync to update the remote
-+ACLs to be the same as the local ACLs. This will work only if the
-+remote machine's rsync supports this option also. This is a non-standard
-+option.
-+
- dit(bf(-o, --owner)) This option causes rsync to set the owner of the
- destination file to be the same as the source file. On most systems,
- only the super-user can set file ownership. By default, the preservation
--- orig/smb_acls.h 2004-06-30 00:04:07
+++ smb_acls.h 2004-06-30 00:04:07
@@ -0,0 +1,277 @@
+
+#endif /* No ACLs. */
+#endif /* _SMB_ACLS_H */
---- orig/uidlist.c 2005-02-14 02:45:11
-+++ uidlist.c 2004-07-03 20:11:58
+--- orig/testsuite/default-acls-obey.test 2005-10-15 16:08:45
++++ testsuite/default-acls-obey.test 2005-10-15 16:08:45
+@@ -0,0 +1,51 @@
++#! /bin/sh
++
++# This program is distributable under the terms of the GNU GPL see
++# COPYING).
++
++# Test that rsync obeys default ACLs. -- Matt McCutchen
++
++. $srcdir/testsuite/rsync.fns
++
++set -x
++
++$RSYNC --help | grep -q "ACLs" || test_skipped "Rsync is configured without ACL support"
++setfacl -dm u::rwx,g::---,o::--- "$scratchdir" || test_skipped "Your filesystem has ACLs disabled"
++
++echo "File!" >"$scratchdir/file"
++echo "#!/bin/bash" >"$scratchdir/program"
++chmod 666 "$scratchdir/file"
++chmod 777 "$scratchdir/program"
++
++# Call as: testit <dirname> <default-acl> <file-expected> <program-expected>
++function testit {
++ todir="$scratchdir/$1"
++ mkdir "$todir"
++ setfacl -k "$todir"
++ chmod g-s "$todir" ### Don't let directory setgid interfere
++ [ "$2" ] && setfacl -dm "$2" "$todir"
++ # Make sure we obey ACLs when creating a directory to hold multiple transferred files,
++ # even though the directory itself is outside the transfer
++ $RSYNC -rvv "$scratchdir/file" "$scratchdir/program" "$todir/to/"
++ [ `stat --format=%a "$todir/to"` == $4 ] || test_fail "Target $1: to should have $4 permissions"
++ [ `stat --format=%a "$todir/to/file"` == $3 ] || test_fail "Target $1: to/file should have $3 permissions"
++ [ `stat --format=%a "$todir/to/program"` == $4 ] || test_fail "Target $1: to/program should have $4 permissions"
++ # Make sure get_local_name doesn't mess us up when transferring only one file
++ $RSYNC -rvv "$scratchdir/file" "$todir/to/anotherfile"
++ [ `stat --format=%a "$todir/to/anotherfile"` == $3 ] || test_fail "Target $1: to/anotherfile should have $3 permissions"
++}
++
++# Test some target directories
++umask 0077
++testit da777 u::rwx,g::rwx,o::rwx 666 777
++testit da775 u::rwx,g::rwx,o::r-x 664 775
++testit da750 u::rwx,g::r-x,o::--- 640 750
++testit da770mask u::rwx,g::---,m::rwx,o::--- 660 770
++testit noda1 '' 600 700
++umask 0000
++testit noda2 '' 666 777
++umask 0022
++testit noda3 '' 644 755
++
++# Hooray
++exit 0
+--- orig/uidlist.c 2006-01-25 17:15:13
++++ uidlist.c 2006-01-25 17:45:21
@@ -34,6 +34,7 @@
extern int verbose;
extern int preserve_uid;
/* read the uid list */
while ((id = read_int(f)) != 0) {
int len = read_byte(f);
-@@ -325,7 +326,7 @@ void recv_uid_list(int f, struct file_li
+@@ -324,7 +325,7 @@ void recv_uid_list(int f, struct file_li
+ }
}
-
- if (preserve_gid && !numeric_ids) {
+ if ((preserve_gid || preserve_acls) && !numeric_ids) {
/* read the gid list */
while ((id = read_int(f)) != 0) {
int len = read_byte(f);
-@@ -337,6 +338,18 @@ void recv_uid_list(int f, struct file_li
+@@ -336,6 +337,18 @@ void recv_uid_list(int f, struct file_li
}
}
-+#if SUPPORT_ACLS
++#ifdef SUPPORT_ACLS
+ if (preserve_acls && !numeric_ids) {
+ id_t id;
-+ /* the enumerations don't return 0 except to flag the last
-+ * entry, since uidlist doesn't munge 0 anyway */
-+ while ((id = next_acl_uid(flist)))
++ /* The enumerations don't return 0 except to flag the last
++ * entry, since uidlist doesn't munge 0 anyway. */
++ while ((id = next_acl_uid(flist)) != 0)
+ acl_uid_map(match_uid(id));
-+ while ((id = next_acl_gid(flist)))
++ while ((id = next_acl_gid(flist)) != 0)
+ acl_gid_map(match_gid(id));
+ }
+#endif /* SUPPORT_ACLS */
+
- /* now convert the uid/gid of all files in the list to the mapped
- * uid/gid */
+ /* Now convert all the uids/gids from sender values to our values. */
if (am_root && preserve_uid && !numeric_ids) {
+ for (i = 0; i < flist->count; i++)
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff