Fixed failing hunks.

[rsync/rsync-patches.git] / acls.diff

diff --git a/acls.diff b/acls.diff
index f133f26..5d78733 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -1165,7 +1165,7 @@ ACLs to a non-ACL-supporting disk should complain.
 +}
 +
 +#endif /* SUPPORT_ACLS */
---- orig/backup.c      2006-01-14 08:14:29
+--- orig/backup.c      2006-01-20 21:12:21
 +++ backup.c   2004-10-06 00:13:09
 @@ -134,6 +134,7 @@ static int make_bak_dir(char *fullpath)
                        } else {
@@ -1284,21 +1284,21 @@ ACLs to a non-ACL-supporting disk should complain.
  AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
  AC_OUTPUT
  
---- orig/flist.c       2006-01-17 02:15:59
-+++ flist.c    2005-07-29 02:49:06
-@@ -958,6 +958,8 @@ static struct file_struct *send_file_nam
-       file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS);
+--- orig/flist.c       2006-01-21 08:00:25
++++ flist.c    2006-01-21 08:04:42
+@@ -965,6 +965,8 @@ static struct file_struct *send_file_nam
+                        f == -2 ? SERVER_FILTERS : ALL_FILTERS);
        if (!file)
                return NULL;
 +      if (MAKE_ACL(file, fname) < 0)
 +              return NULL;
  
-       maybe_emit_filelist_progress(flist->count + flist_count_offset);
- 
-@@ -966,6 +968,10 @@ static struct file_struct *send_file_nam
+       if (chmod_modes && (S_ISREG(file->mode) || S_ISDIR(file->mode)))
+               file->mode = tweak_mode(file->mode, chmod_modes);
+@@ -976,6 +978,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). */
@@ -1306,7 +1306,7 @@ ACLs to a non-ACL-supporting disk should complain.
        }
        return file;
  }
-@@ -1320,6 +1326,8 @@ struct file_list *recv_file_list(int f)
+@@ -1366,6 +1372,8 @@ struct file_list *recv_file_list(int f)
                        flags |= read_byte(f) << 8;
                file = receive_file_entry(flist, flags, f);
  
@@ -1315,7 +1315,7 @@ ACLs to a non-ACL-supporting disk should complain.
                if (S_ISREG(file->mode))
                        stats.total_size += file->length;
  
-@@ -1342,6 +1350,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);
  
@@ -1324,7 +1324,7 @@ 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   2006-01-14 20:27:09
+--- orig/generator.c   2006-01-20 21:12:17
 +++ generator.c        2006-01-14 08:17:25
 @@ -890,6 +890,10 @@ static void recv_generator(char *fname, 
                if (set_perms(fname, file, statret ? NULL : &st, 0)
@@ -4624,7 +4624,7 @@ ACLs to a non-ACL-supporting disk should complain.
    next;
  }
  
---- orig/options.c     2006-01-14 08:14:30
+--- orig/options.c     2006-01-21 07:55:00
 +++ options.c  2005-08-27 21:15:29
 @@ -44,6 +44,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
@@ -4653,8 +4653,8 @@ ACLs to a non-ACL-supporting disk should complain.
  #ifdef SUPPORT_LINKS
        links = "";
  #endif
-@@ -218,9 +224,9 @@ static void print_rsync_version(enum log
-               "Copyright (C) 1996-2005 by Andrew Tridgell and others\n");
+@@ -217,9 +223,9 @@ static void print_rsync_version(enum log
+       rprintf(f, "Copyright (C) 1996-2006 by Wayne Davison, Andrew Tridgell, and others\n");
        rprintf(f, "<http://rsync.samba.org/>\n");
        rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
 -              "%shard links, %ssymlinks, batchfiles, \n",
@@ -4665,7 +4665,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
-@@ -290,6 +296,7 @@ void usage(enum logcode F)
+@@ -287,6 +293,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");
@@ -4673,7 +4673,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");
-@@ -399,6 +406,9 @@ static struct poptOption long_options[] 
+@@ -396,6 +403,9 @@ static struct poptOption long_options[] 
    {"perms",           'p', POPT_ARG_VAL,    &preserve_perms, 1, 0, 0 },
    {"no-perms",         0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
    {"no-p",             0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
@@ -4683,7 +4683,7 @@ ACLs to a non-ACL-supporting disk should complain.
    {"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 },
-@@ -1000,6 +1010,24 @@ int parse_arguments(int *argc, const cha
+@@ -1005,6 +1015,24 @@ int parse_arguments(int *argc, const cha
                        basis_dir[basis_dir_cnt++] = (char *)arg;
                        break;
  
@@ -4708,7 +4708,7 @@ ACLs to a non-ACL-supporting disk should complain.
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1434,6 +1462,8 @@ void server_options(char **args,int *arg
+@@ -1441,6 +1469,8 @@ void server_options(char **args,int *arg
  
        if (preserve_hard_links)
                argstr[x++] = 'H';
@@ -4781,7 +4781,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      2006-01-14 08:14:31
+--- orig/rsync.yo      2006-01-21 08:12:23
 +++ rsync.yo   2004-07-03 20:11:58
 @@ -316,6 +316,7 @@ to the detailed description below for a 
   -H, --hard-links            preserve hard links