+}
+
+#endif /* SUPPORT_ACLS */
---- orig/backup.c 2005-02-14 02:45:09
+--- orig/backup.c 2005-02-22 02:10:16
+++ 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)
+@@ -187,6 +188,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) {
-@@ -246,6 +249,7 @@ static int keep_backup(char *fname)
+@@ -260,6 +263,7 @@ static int keep_backup(char *fname)
}
}
set_perms(buf, file, NULL, 0);
free(file);
if (verbose > 1) {
---- orig/configure.in 2005-01-28 23:01:08
+--- orig/configure.in 2005-02-25 18:44:31
+++ configure.in 2004-08-19 19:53:27
@@ -467,6 +467,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
AC_CHECK_LIB(resolv, strcasecmp)
AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
AC_OUTPUT
---- orig/flist.c 2005-02-14 02:45:10
+--- orig/flist.c 2005-02-26 19:27:54
+++ flist.c 2005-02-14 02:45:34
-@@ -978,6 +978,8 @@ void send_file_name(int f, struct file_l
+@@ -971,6 +971,8 @@ void send_file_name(int f, struct file_l
file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS);
if (!file)
return;
maybe_emit_filelist_progress(flist);
-@@ -986,6 +988,10 @@ void send_file_name(int f, struct file_l
+@@ -979,6 +981,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)
-@@ -1296,6 +1302,8 @@ struct file_list *recv_file_list(int f)
+@@ -1293,6 +1299,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)
+@@ -1315,6 +1323,8 @@ struct file_list *recv_file_list(int f)
clean_flist(flist, relative_paths, 1);
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,
+--- orig/generator.c 2005-02-27 18:24:42
++++ generator.c 2005-02-20 00:02:51
+@@ -686,6 +686,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));
+ && verbose && code && f_out != -1)
+ rprintf(code, "%s/\n", safe_fname(fname));
+#if SUPPORT_ACLS
+ if (f_out == -1)
+ SET_ACL(fname, file);
+#endif
if (delete_during && f_out != -1 && csum_length != SUM_LENGTH
&& (file->flags & FLAG_DEL_HERE))
- delete_in_dir(flist, fname, file);
+ delete_in_dir(flist, fname, file, allowed_lull);
--- 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 2005-02-18 18:02:45
+--- orig/options.c 2005-03-01 05:49:24
+++ options.c 2005-02-14 02:46:05
@@ -44,6 +44,7 @@ int keep_dirlinks = 0;
int copy_links = 0;
int preserve_perms = 0;
int preserve_devices = 0;
int preserve_uid = 0;
-@@ -169,6 +170,7 @@ static void print_rsync_version(enum log
+@@ -178,6 +179,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
+@@ -194,6 +196,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
+@@ -208,9 +214,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, "
/* 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)
+@@ -280,6 +286,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," -o, --owner preserve owner (root 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[]
+@@ -402,6 +409,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 },
-@@ -837,6 +845,24 @@ int parse_arguments(int *argc, const cha
+@@ -854,6 +862,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. */
-@@ -1226,6 +1252,8 @@ void server_options(char **args,int *arg
+@@ -1261,6 +1287,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
+--- orig/rsync.c 2005-02-25 18:44:31
+++ rsync.c 2004-07-03 20:11:58
-@@ -238,6 +238,14 @@ int set_perms(char *fname,struct file_st
+@@ -138,6 +138,14 @@ int set_perms(char *fname,struct file_st
}
#endif
+ }
+
if (verbose > 1 && flags & PERMS_REPORT) {
- if (updated)
- rprintf(FINFO, "%s\n", safe_fname(fname));
---- orig/rsync.h 2005-02-16 17:08:13
+ enum logcode code = daemon_log_format_has_i || dry_run
+ ? FCLIENT : FINFO;
+--- orig/rsync.h 2005-02-23 02:57:27
+++ rsync.h 2004-07-03 20:11:58
-@@ -625,6 +625,40 @@ struct stats {
+@@ -628,6 +628,40 @@ struct stats {
#include "lib/permstring.h"
#include "lib/addrinfo.h"
#include "proto.h"
/* We have replacement versions of these if they're missing. */
---- orig/rsync.yo 2005-02-18 20:17:35
+--- orig/rsync.yo 2005-03-01 01:22:59
+++ rsync.yo 2004-07-03 20:11:58
@@ -317,6 +317,7 @@ to the detailed description below for a
-H, --hard-links preserve hard links
git.samba.org / rsync-patches.git / blobdiff