X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/93ca4d27d3d0806c3085aef4dbb331ba451b3dc4..bd68c3c2ed721c5cac5abd3602cba9199f678d62:/acls.diff

diff --git a/acls.diff b/acls.diff
index 5345511..f133f26 100644
--- a/acls.diff
+++ b/acls.diff
@@ -760,7 +760,7 @@ ACLs to a non-ACL-supporting disk should complain.
 +	char *fname;
 +	if (!preserve_acls || S_ISLNK(file->mode))
 +		return;
-+	fname = f_name(file);
++	fname = f_name(file, NULL);
 +	for (type = &types[0];
 +	     type < &types[0] + sizeof types / sizeof types[0]
 +		&& (*type == SMB_ACL_TYPE_ACCESS || S_ISDIR(file->mode));
@@ -1192,7 +1192,7 @@ ACLs to a non-ACL-supporting disk should complain.
  	free(file);
  
  	if (verbose > 1) {
---- orig/configure.in	2006-01-14 08:14:30
+--- orig/configure.in	2006-01-15 14:52:33
 +++ 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)
@@ -1206,7 +1206,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.
-@@ -744,6 +749,77 @@ AC_SUBST(OBJ_RESTORE)
+@@ -750,6 +755,77 @@ AC_SUBST(OBJ_RESTORE)
  AC_SUBST(CC_SHOBJ_FLAG)
  AC_SUBST(BUILD_POPT)
  
@@ -1284,9 +1284,9 @@ 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-14 08:14:30
+--- orig/flist.c	2006-01-17 02:15:59
 +++ flist.c	2005-07-29 02:49:06
-@@ -960,6 +960,8 @@ static struct file_struct *send_file_nam
+@@ -958,6 +958,8 @@ static struct file_struct *send_file_nam
  	file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS);
  	if (!file)
  		return NULL;
@@ -1295,7 +1295,7 @@ ACLs to a non-ACL-supporting disk should complain.
  
  	maybe_emit_filelist_progress(flist->count + flist_count_offset);
  
-@@ -968,6 +970,10 @@ static struct file_struct *send_file_nam
+@@ -966,6 +968,10 @@ static struct file_struct *send_file_nam
  	if (file->basename[0]) {
  		flist->files[flist->count++] = file;
  		send_file_entry(file, f, base_flags);
@@ -1306,7 +1306,7 @@ ACLs to a non-ACL-supporting disk should complain.
  	}
  	return file;
  }
-@@ -1322,6 +1328,8 @@ struct file_list *recv_file_list(int f)
+@@ -1320,6 +1326,8 @@ struct file_list *recv_file_list(int f)
  			flags |= read_byte(f) << 8;
  		file = receive_file_entry(flist, flags, f);
  
@@ -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 08:14:30
+--- orig/generator.c	2006-01-14 20:27:09
 +++ 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)
@@ -4734,9 +4734,9 @@ ACLs to a non-ACL-supporting disk should complain.
  	if (verbose > 1 && flags & PERMS_REPORT) {
  		enum logcode code = daemon_log_format_has_i || dry_run
  				  ? FCLIENT : FINFO;
---- orig/rsync.h	2006-01-14 08:14:31
+--- orig/rsync.h	2006-01-14 20:27:10
 +++ rsync.h	2005-07-29 02:25:55
-@@ -646,6 +646,44 @@ struct stats {
+@@ -647,6 +647,44 @@ struct stats {
  #include "lib/permstring.h"
  #include "lib/addrinfo.h"