From bb81ee9808abe54547978b3120cdfeca6663467b Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Sun, 5 Feb 2006 05:06:04 +0000
Subject: [PATCH] Added an extra test to default-acls.diff.

---
 acls.diff | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/acls.diff b/acls.diff
index 6dad285..630f64b 100644
--- 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-02-04 22:04:06
+--- orig/configure.in	2006-02-05 04:53:34
 +++ 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)
@@ -4903,7 +4903,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-02-04 22:04:06
+--- orig/rsync.c	2006-02-05 04:53:34
 +++ rsync.c	2006-02-04 19:53:13
 @@ -88,7 +88,8 @@ void free_sums(struct sum_struct *s)
  
@@ -5312,9 +5312,9 @@ ACLs to a non-ACL-supporting disk should complain.
 +
 +#endif /* No ACLs. */
 +#endif /* _SMB_ACLS_H */
---- orig/testsuite/default-acls.test	2006-02-04 19:56:21
-+++ testsuite/default-acls.test	2006-02-04 19:56:21
-@@ -0,0 +1,52 @@
+--- orig/testsuite/default-acls.test	2006-02-04 22:48:07
++++ testsuite/default-acls.test	2006-02-04 22:48:07
+@@ -0,0 +1,55 @@
 +#! /bin/sh
 +
 +# This program is distributable under the terms of the GNU GPL see
@@ -5344,6 +5344,9 @@ ACLs to a non-ACL-supporting disk should complain.
 +    # Make sure get_local_name doesn't mess us up when transferring only one file
 +    $RSYNC -rvv "$scratchdir/file" "$todir/to/anotherfile"
 +    check_perms "$todir/to/anotherfile" $3 "Target $1"
++    # Make sure we obey default ACLs when not transferring a regular file
++    $RSYNC -rvv "$scratchdir/dir" "$todir/to/anotherdir"
++    check_perms "$todir/to/anotherdir" $4 "Target $1"
 +}
 +
 +mkdir "$scratchdir/dir"
-- 
2.34.1