+}
+
+#endif /* SUPPORT_ACLS */
---- orig/backup.c 2004-10-06 00:12:15
+--- orig/backup.c 2005-02-14 02:45:09
+++ backup.c 2004-10-06 00:13:09
-@@ -119,6 +119,7 @@ static int make_bak_dir(char *fullpath)
+@@ -121,6 +121,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 = '/';
-@@ -176,6 +177,8 @@ static int keep_backup(char *fname)
+@@ -173,6 +174,8 @@ static int keep_backup(char *fname)
if (!(buf = get_backup_name(fname)))
return 0;
/* Check to see if this is a device file, or link */
if (IS_DEVICE(file->mode)) {
if (am_root && preserve_devices) {
-@@ -249,6 +252,7 @@ static int keep_backup(char *fname)
+@@ -246,6 +249,7 @@ static int keep_backup(char *fname)
}
}
set_perms(buf, file, NULL, 0);
+ CLEANUP_KEEP_BACKUP_ACL();
free(file);
- if (verbose > 1)
---- orig/configure.in 2004-10-06 00:12:16
+ if (verbose > 1) {
+--- orig/configure.in 2005-01-28 23:01:08
+++ configure.in 2004-08-19 19:53:27
-@@ -443,6 +443,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
+@@ -467,6 +467,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.
-@@ -693,6 +698,77 @@ AC_SUBST(OBJ_RESTORE)
+@@ -713,6 +718,77 @@ AC_SUBST(OBJ_RESTORE)
AC_SUBST(CC_SHOBJ_FLAG)
AC_SUBST(BUILD_POPT)
AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
AC_OUTPUT
---- orig/flist.c 2004-09-21 09:40:27
-+++ flist.c 2004-07-03 20:11:58
-@@ -966,6 +966,8 @@ void send_file_name(int f, struct file_l
-
+--- 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);
if (!file)
return;
+ if (!MAKE_ACL(file, fname))
maybe_emit_filelist_progress(flist);
-@@ -974,6 +976,10 @@ void send_file_name(int f, struct file_l
+@@ -986,6 +988,10 @@ void send_file_name(int f, struct file_l
if (file->basename[0]) {
flist->files[flist->count++] = file;
send_file_entry(file, f, base_flags);
}
if (recursive && S_ISDIR(file->mode)
-@@ -1291,6 +1297,8 @@ struct file_list *recv_file_list(int f)
+@@ -1296,6 +1302,8 @@ struct file_list *recv_file_list(int f)
flags |= read_byte(f) << 8;
- receive_file_entry(&flist->files[i], flags, flist, f);
+ file = receive_file_entry(flist, flags, f);
-+ RECEIVE_ACL(flist->files[i], f);
++ RECEIVE_ACL(file, f);
+
- if (S_ISREG(flist->files[i]->mode))
- stats.total_size += flist->files[i]->length;
+ if (S_ISREG(file->mode))
+ stats.total_size += file->length;
-@@ -1313,6 +1321,8 @@ struct file_list *recv_file_list(int f)
+@@ -1318,6 +1326,8 @@ struct file_list *recv_file_list(int f)
clean_flist(flist, relative_paths, 1);
+ SORT_FILE_ACL_INDEX_LISTS();
+
- if (f != -1) {
+ if (f >= 0) {
/* Now send the uid/gid list. This was introduced in
* protocol version 15 */
---- orig/generator.c 2004-11-27 17:53:24
-+++ generator.c 2004-07-03 20:11:58
-@@ -342,6 +342,10 @@ static void recv_generator(char *fname,
+--- orig/generator.c 2005-02-14 02:45:10
++++ generator.c 2005-01-30 10:09:44
+@@ -406,6 +406,10 @@ static void recv_generator(char *fname,
if (set_perms(fname, file, statret ? NULL : &st, 0)
&& verbose && f_out != -1)
rprintf(FINFO, "%s/\n", safe_fname(fname));
+ if (f_out == -1)
+ SET_ACL(fname, file);
+#endif
- return;
- } else if (max_size && file->length > max_size) {
- if (verbose > 1)
+ if (delete_during && f_out != -1 && csum_length != SUM_LENGTH
+ && (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 @@
next;
}
---- orig/options.c 2004-11-27 18:27:35
-+++ options.c 2004-08-19 17:38:57
-@@ -43,6 +43,7 @@ int keep_dirlinks = 0;
+--- orig/options.c 2005-02-14 02:45:10
++++ options.c 2005-02-14 02:46:05
+@@ -44,6 +44,7 @@ int keep_dirlinks = 0;
int copy_links = 0;
int preserve_links = 0;
int preserve_hard_links = 0;
int preserve_perms = 0;
int preserve_devices = 0;
int preserve_uid = 0;
-@@ -159,6 +160,7 @@ static void print_rsync_version(enum log
+@@ -167,6 +168,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;
-@@ -175,6 +177,10 @@ static void print_rsync_version(enum log
+@@ -183,6 +185,10 @@ static void print_rsync_version(enum log
hardlinks = "";
#endif
-+#if SUPPORT_ACLS
++#ifdef SUPPORT_ACLS
+ acls = "";
+#endif
+
- #if SUPPORT_LINKS
+ #ifdef SUPPORT_LINKS
links = "";
#endif
-@@ -189,9 +195,9 @@ static void print_rsync_version(enum log
- "Copyright (C) 1996-2004 by Andrew Tridgell and others\n");
+@@ -197,9 +203,9 @@ static void print_rsync_version(enum log
+ "Copyright (C) 1996-2005 by Andrew Tridgell 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
-@@ -256,6 +262,7 @@ void usage(enum logcode F)
- rprintf(F," --safe-links ignore \"unsafe\" symlinks\n");
+@@ -269,6 +275,7 @@ void usage(enum logcode F)
rprintf(F," -H, --hard-links preserve hard links\n");
+ rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
rprintf(F," -p, --perms preserve permissions\n");
+ rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
rprintf(F," -o, --owner preserve owner (root only)\n");
rprintf(F," -g, --group preserve group\n");
rprintf(F," -D, --devices preserve devices (root only)\n");
-@@ -361,6 +368,7 @@ static struct poptOption long_options[]
+@@ -389,6 +396,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 },
{"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 },
-@@ -749,6 +757,24 @@ int parse_arguments(int *argc, const cha
+@@ -834,6 +842,24 @@ int parse_arguments(int *argc, const cha
basis_dir[basis_dir_cnt++] = (char *)arg;
break;
+
default:
/* A large opt value means that set_refuse_options()
- * turned this option off (opt-BASE is its index). */
-@@ -1072,6 +1098,8 @@ void server_options(char **args,int *arg
+ * turned this option off. */
+@@ -1206,6 +1232,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 2004-09-07 21:45:30
+--- orig/rsync.c 2005-02-14 02:45:10
+++ rsync.c 2004-07-03 20:11:58
-@@ -207,6 +207,14 @@ int set_perms(char *fname,struct file_st
+@@ -238,6 +238,14 @@ int set_perms(char *fname,struct file_st
}
#endif
+
if (verbose > 1 && flags & PERMS_REPORT) {
if (updated)
- rprintf(FINFO,"%s\n",fname);
---- orig/rsync.h 2004-11-27 17:53:24
+ rprintf(FINFO, "%s\n", safe_fname(fname));
+--- orig/rsync.h 2005-02-14 02:45:10
+++ rsync.h 2004-07-03 20:11:58
-@@ -552,6 +552,40 @@ static inline int flist_up(struct file_l
+@@ -612,6 +612,40 @@ struct stats {
#include "lib/permstring.h"
#include "lib/addrinfo.h"
+#define ACLS_NEED_MASK HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|HAVE_HPUX_ACLS
+
+#if SUPPORT_ACLS
-+#ifdef HAVE_SYS_ACL_H
++#if HAVE_SYS_ACL_H
+#include <sys/acl.h>
+#endif
+#define MAKE_ACL(file, fname) make_acl(file, fname)
#include "proto.h"
/* We have replacement versions of these if they're missing. */
---- orig/rsync.yo 2004-11-27 17:53:24
+--- orig/rsync.yo 2005-02-14 02:45:11
+++ rsync.yo 2004-07-03 20:11:58
-@@ -326,6 +326,7 @@ verb(
- --safe-links ignore "unsafe" symlinks
+@@ -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)
-g, --group preserve group
-D, --devices preserve devices (root only)
-@@ -594,6 +595,11 @@ source file's permissions and the umask
+@@ -614,6 +615,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).
+
+#endif /* No ACLs. */
+#endif /* _SMB_ACLS_H */
---- orig/uidlist.c 2004-04-29 19:37:25
+--- orig/uidlist.c 2005-02-14 02:45:11
+++ uidlist.c 2004-07-03 20:11:58
@@ -34,6 +34,7 @@
extern int verbose;
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff