[Bug 2780] New: fix acl patch

[samba-bugs at samba.org]

https://bugzilla.samba.org/show_bug.cgi?id=2780

           Summary: fix acl patch
           Product: rsync
           Version: 2.6.5
          Platform: All
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P3
         Component: core
        AssignedTo: wayned at samba.org
        ReportedBy: flepied at mandriva.com
         QAContact: rsync-qa at samba.org


--- rsync-2.6.5/patches/acls.diff.acl-patch	2005-06-01 18:22:41.000000000 +0200
+++ rsync-2.6.5/patches/acls.diff	2005-06-09 09:10:29.628842558 +0200
@@ -21,7 +21,7 @@
 +HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h
  LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
 -	lib/permstring.o lib/pool_alloc.o @LIBOBJS@
-+	lib/permstring.o lib/pool_alloc.o lib/sysacls.o @LIBOBJS@
++	lib/permstring.o lib/pool_alloc.o sysacls.o @LIBOBJS@
  ZLIBOBJ=zlib/deflate.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
  	zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
  	zlib/zutil.o zlib/adler32.o
@@ -58,7 +58,7 @@
 +/* handle passing ACLs between systems */
 +
 +#include "rsync.h"
-+#include "lib/sysacls.h"
++#include "sysacls.h"
 +
 +#ifdef SUPPORT_ACLS
 +
@@ -4735,7 +4735,7 @@
  				  ? FCLIENT : FINFO;
 --- orig/rsync.h	2005-05-03 17:11:01
 +++ rsync.h	2005-05-12 23:32:56
-@@ -638,6 +638,44 @@ struct stats {
+@@ -638,6 +638,46 @@
  #include "lib/permstring.h"
  #include "lib/addrinfo.h"
  
@@ -4777,9 +4777,18 @@
 +#endif /* SUPPORT_ACLS */
 +#include "smb_acls.h"
 +
++#define UNUSED(x) x __attribute__((__unused__))
++
  #include "proto.h"
  
  /* We have replacement versions of these if they're missing. */
+@@ -861,6 +901,4 @@
+ const char *get_panic_action(void);
+ #endif
+ 
+-#define UNUSED(x) x __attribute__((__unused__))
+-
+ extern const char *io_write_phase, *io_read_phase;
 --- orig/rsync.yo	2005-05-22 20:53:34
 +++ rsync.yo	2004-07-03 20:11:58
 @@ -317,6 +317,7 @@ to the detailed description below for a

-- 
Configure bugmail: https://bugzilla.samba.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug, or are watching the QA contact.