From: Wayne Davison <wayned@samba.org>
Date: Fri, 18 Feb 2005 20:21:32 +0000 (+0000)
Subject: Fixed a failing hunk.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/3c114e8d7baa05e99d592898080bff8a29a039e6

Fixed a failing hunk.
---

diff --git a/acls.diff b/acls.diff
index 76747a8..a7d056a 100644
--- a/acls.diff
+++ b/acls.diff
@@ -1325,9 +1325,9 @@ 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-16 17:08:13
+--- orig/generator.c	2005-02-18 20:17:34
 +++ generator.c	2005-01-30 10:09:44
-@@ -448,6 +448,10 @@ static void recv_generator(char *fname, 
+@@ -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));
@@ -4586,18 +4586,18 @@ ACLs to a non-ACL-supporting disk should complain.
 +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	2004-01-01 21:10:50
-+++ mkproto.awk	2004-10-20 08:03:05
+--- orig/mkproto.awk	2005-02-18 20:17:35
++++ mkproto.awk	2005-02-18 20:18:17
 @@ -58,7 +58,7 @@ BEGIN {
    next;
  }
  
--!/^OFF_T|^size_t|^off_t|^pid_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^struct|^BOOL|^void|^time|^const/ {
-+!/^OFF_T|^size_t|^off_t|^pid_t|id_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^struct|^BOOL|^void|^time|^const/ {
+-!/^OFF_T|^size_t|^off_t|^pid_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^uchar|^short|^struct|^BOOL|^void|^time|^const/ {
++!/^OFF_T|^size_t|^off_t|^pid_t|^id_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^uchar|^short|^struct|^BOOL|^void|^time|^const/ {
    next;
  }
  
---- orig/options.c	2005-02-16 17:08:13
+--- orig/options.c	2005-02-18 18:02:45
 +++ options.c	2005-02-14 02:46:05
 @@ -44,6 +44,7 @@ int keep_dirlinks = 0;
  int copy_links = 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 },
-@@ -840,6 +848,24 @@ int parse_arguments(int *argc, const cha
+@@ -837,6 +845,24 @@ int parse_arguments(int *argc, const cha
  			basis_dir[basis_dir_cnt++] = (char *)arg;
  			break;
  
@@ -4679,7 +4679,7 @@ ACLs to a non-ACL-supporting disk should complain.
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off. */
-@@ -1229,6 +1255,8 @@ void server_options(char **args,int *arg
+@@ -1226,6 +1252,8 @@ void server_options(char **args,int *arg
  
  	if (preserve_hard_links)
  		argstr[x++] = '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-16 15:35:54
+--- orig/rsync.yo	2005-02-18 20:17:35
 +++ 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
@@ -4758,7 +4758,7 @@ ACLs to a non-ACL-supporting disk should complain.
   -o, --owner                 preserve owner (root only)
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
-@@ -615,6 +616,11 @@ source file's permissions and the umask 
+@@ -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).