Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
04ea84f
)
Added an extra test to default-acls.diff.
author
Wayne Davison
<wayned@samba.org>
Sun, 5 Feb 2006 05:06:04 +0000
(
05:06
+0000)
committer
Wayne Davison
<wayned@samba.org>
Sun, 5 Feb 2006 05:06:04 +0000
(
05:06
+0000)
acls.diff
patch
|
blob
|
blame
|
history
diff --git
a/acls.diff
b/acls.diff
index
6dad285
..
630f64b
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) {
free(file);
if (verbose > 1) {
---- orig/configure.in 2006-02-0
4 22:04:06
+--- orig/configure.in 2006-02-0
5 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)
+++ 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" */
}
/* We now check to see if we are writing file "inplace" */
---- orig/rsync.c 2006-02-0
4 22:04:06
+--- orig/rsync.c 2006-02-0
5 04:53:34
+++ rsync.c 2006-02-04 19:53:13
@@ -88,7 +88,8 @@ void free_sums(struct sum_struct *s)
+++ 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 */
+
+#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,5
2
@@
+--- orig/testsuite/default-acls.test 2006-02-04
22:48:07
++++ testsuite/default-acls.test 2006-02-04
22:48:07
+@@ -0,0 +1,5
5
@@
+#! /bin/sh
+
+# This program is distributable under the terms of the GNU GPL see
+#! /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 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"
+}
+
+mkdir "$scratchdir/dir"