Fixed failing hunks.

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

diff --git a/acls.diff b/acls.diff
index bdd795c..e891fd3 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -1264,7 +1264,7 @@ ACLs to a non-ACL-supporting disk should complain.
        free(file);
  
        if (verbose > 1) {
---- orig/configure.in  2006-01-15 14:52:33
+--- orig/configure.in  2006-02-02 02:41:09
 +++ configure.in       2004-08-19 19:53:27
 @@ -478,6 +478,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
      AC_CHECK_LIB(resolv, strcasecmp)
@@ -1278,7 +1278,7 @@ ACLs to a non-ACL-supporting disk should complain.
  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.
-@@ -750,6 +755,77 @@ AC_SUBST(OBJ_RESTORE)
+@@ -751,6 +756,77 @@ AC_SUBST(OBJ_RESTORE)
  AC_SUBST(CC_SHOBJ_FLAG)
  AC_SUBST(BUILD_POPT)
  
@@ -4769,19 +4769,19 @@ 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   2005-02-18 20:16:59
-+++ mkproto.awk        2005-02-18 20:18:17
+--- orig/mkproto.awk   2006-02-02 02:41:09
++++ mkproto.awk        2006-02-02 02:41:47
 @@ -58,7 +58,7 @@ BEGIN {
    next;
  }
  
--!/^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/ {
+-!/^OFF_T|^size_t|^off_t|^pid_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^uchar|^short|^struct|^BOOL|^void|^time|^const|^RETSIGTYPE/ {
++!/^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|^RETSIGTYPE/ {
    next;
  }
  
---- orig/options.c     2006-01-31 03:11:30
-+++ options.c  2006-01-31 03:11:18
+--- orig/options.c     2006-02-02 11:40:45
++++ options.c  2006-02-02 11:45:46
 @@ -44,6 +44,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
  int preserve_links = 0;
@@ -4813,8 +4813,8 @@ ACLs to a non-ACL-supporting disk should complain.
        rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
        rprintf(f, "<http://rsync.samba.org/>\n");
        rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
--              "%shard links, %ssymlinks, batchfiles, \n",
-+              "%shard links, %sACLs, %ssymlinks, batchfiles, \n",
+-              "%shard links, %ssymlinks, batchfiles,\n",
++              "%shard links, %sACLs, %ssymlinks, batchfiles,\n",
                (int) (sizeof (OFF_T) * 8),
 -              got_socketpair, hardlinks, links);
 +              got_socketpair, hardlinks, acls, links);
@@ -4912,7 +4912,7 @@ ACLs to a non-ACL-supporting disk should complain.
                }
  
                /* We now check to see if we are writing file "inplace" */
---- orig/rsync.c       2006-01-31 02:30:18
+--- orig/rsync.c       2006-02-02 02:41:09
 +++ rsync.c    2006-01-31 19:35:44
 @@ -53,7 +53,8 @@ void free_sums(struct sum_struct *s)
  
@@ -4948,11 +4948,11 @@ ACLs to a non-ACL-supporting disk should complain.
        if (verbose > 1 && flags & ATTRS_REPORT) {
                enum logcode code = daemon_log_format_has_i || dry_run
                                  ? FCLIENT : FINFO;
---- orig/rsync.h       2006-01-30 20:39:09
+--- orig/rsync.h       2006-02-02 02:41:09
 +++ rsync.h    2006-01-31 19:27:00
-@@ -648,6 +648,44 @@ struct chmod_mode_struct;
- #include "lib/permstring.h"
- #include "lib/addrinfo.h"
+@@ -650,6 +650,44 @@ struct chmod_mode_struct;
+ 
+ #define UNUSED(x) x __attribute__((__unused__))
  
 +#if HAVE_POSIX_ACLS|HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|\
 +    HAVE_HPUX_ACLS|HAVE_IRIX_ACLS|HAVE_AIX_ACLS|HAVE_TRU64_ACLS