From c7bc7375438d3f080c79c9900a137e7de47d8510 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Wed, 16 Feb 2005 17:09:33 +0000 Subject: [PATCH] Got rid of patch fuzz. --- acls.diff | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/acls.diff b/acls.diff index 084a728..76747a8 100644 --- a/acls.diff +++ b/acls.diff @@ -1325,11 +1325,11 @@ ACLs to a non-ACL-supporting disk should complain. if (f >= 0) { /* Now send the uid/gid list. This was introduced in * protocol version 15 */ ---- orig/generator.c 2005-02-15 19:27:04 +--- orig/generator.c 2005-02-16 17:08:13 +++ generator.c 2005-01-30 10:09:44 -@@ -461,6 +461,10 @@ static void recv_generator(char *fname, +@@ -448,6 +448,10 @@ static void recv_generator(char *fname, if (set_perms(fname, file, statret ? NULL : &st, 0) - && verbose && f_out != -1 && !itemize_changes) + && verbose && protocol_version < 29 && f_out != -1) rprintf(FINFO, "%s/\n", safe_fname(fname)); +#if SUPPORT_ACLS + if (f_out == -1) @@ -4597,7 +4597,7 @@ ACLs to a non-ACL-supporting disk should complain. next; } ---- orig/options.c 2005-02-15 19:27:05 +--- orig/options.c 2005-02-16 17:08:13 +++ options.c 2005-02-14 02:46:05 @@ -44,6 +44,7 @@ int keep_dirlinks = 0; int copy_links = 0; @@ -4607,7 +4607,7 @@ ACLs to a non-ACL-supporting disk should complain. int preserve_perms = 0; int preserve_devices = 0; int preserve_uid = 0; -@@ -168,6 +169,7 @@ static void print_rsync_version(enum log +@@ -169,6 +170,7 @@ static void print_rsync_version(enum log char const *got_socketpair = "no "; char const *have_inplace = "no "; char const *hardlinks = "no "; @@ -4615,7 +4615,7 @@ ACLs to a non-ACL-supporting disk should complain. char const *links = "no "; char const *ipv6 = "no "; STRUCT_STAT *dumstat; -@@ -184,6 +186,10 @@ static void print_rsync_version(enum log +@@ -185,6 +187,10 @@ static void print_rsync_version(enum log hardlinks = ""; #endif @@ -4626,7 +4626,7 @@ ACLs to a non-ACL-supporting disk should complain. #ifdef SUPPORT_LINKS links = ""; #endif -@@ -198,9 +204,9 @@ static void print_rsync_version(enum log +@@ -199,9 +205,9 @@ static void print_rsync_version(enum log "Copyright (C) 1996-2005 by Andrew Tridgell and others\n"); rprintf(f, "\n"); rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, " @@ -4638,7 +4638,7 @@ ACLs to a non-ACL-supporting disk should complain. /* Note that this field may not have type ino_t. It depends * on the complicated interaction between largefile feature -@@ -270,6 +276,7 @@ void usage(enum logcode F) +@@ -271,6 +277,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"); @@ -4646,7 +4646,7 @@ ACLs to a non-ACL-supporting disk should complain. 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"); -@@ -391,6 +398,7 @@ static struct poptOption long_options[] +@@ -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 }, @@ -4654,7 +4654,7 @@ ACLs to a non-ACL-supporting disk should complain. {"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 +@@ -840,6 +848,24 @@ int parse_arguments(int *argc, const cha basis_dir[basis_dir_cnt++] = (char *)arg; break; @@ -4679,8 +4679,8 @@ ACLs to a non-ACL-supporting disk should complain. default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1211,6 +1237,8 @@ void server_options(char **args,int *arg - argstr[x++] = 'i'; +@@ -1229,6 +1255,8 @@ void server_options(char **args,int *arg + if (preserve_hard_links) argstr[x++] = 'H'; + if (preserve_acls) @@ -4705,9 +4705,9 @@ ACLs to a non-ACL-supporting disk should complain. if (verbose > 1 && flags & PERMS_REPORT) { if (updated) rprintf(FINFO, "%s\n", safe_fname(fname)); ---- orig/rsync.h 2005-02-15 19:27:05 +--- orig/rsync.h 2005-02-16 17:08:13 +++ rsync.h 2004-07-03 20:11:58 -@@ -612,6 +612,40 @@ struct stats { +@@ -625,6 +625,40 @@ struct stats { #include "lib/permstring.h" #include "lib/addrinfo.h" @@ -4748,7 +4748,7 @@ ACLs to a non-ACL-supporting disk should complain. #include "proto.h" /* We have replacement versions of these if they're missing. */ ---- orig/rsync.yo 2005-02-15 19:27:05 +--- orig/rsync.yo 2005-02-16 15:35:54 +++ 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 -- 2.34.1