X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/a51c2e890f4f56f1b573f0cc036225bf6645921a..7628f1560a56ef7065bedd89cb5b10bb358c4327:/acls.diff

diff --git a/acls.diff b/acls.diff
index 8b1a978..81f8bd8 100644
--- a/acls.diff
+++ b/acls.diff
@@ -8,7 +8,7 @@ After applying this patch, run these commands for a successful build:
 
 
 --- Makefile.in	15 May 2004 00:48:11 -0000	1.101
-+++ Makefile.in	6 Jun 2004 21:11:46 -0000
++++ Makefile.in	18 Jun 2004 17:21:45 -0000
 @@ -25,7 +25,7 @@ VERSION=@VERSION@
  .SUFFIXES:
  .SUFFIXES: .c .o
@@ -28,7 +28,7 @@ After applying this patch, run these commands for a successful build:
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ acls.c	6 Jun 2004 21:11:46 -0000
++++ acls.c	18 Jun 2004 17:21:45 -0000
 @@ -0,0 +1,1119 @@
 +/* -*- c-file-style: "linux" -*-
 +   Copyright (C) Andrew Tridgell 1996
@@ -1149,8 +1149,8 @@ After applying this patch, run these commands for a successful build:
 +
 +
 +#endif /* SUPPORT_ACLS */
---- backup.c	15 May 2004 19:31:10 -0000	1.31
-+++ backup.c	6 Jun 2004 21:11:46 -0000
+--- backup.c	10 Jun 2004 16:43:52 -0000	1.32
++++ backup.c	18 Jun 2004 17:21:45 -0000
 @@ -105,6 +105,7 @@ static int make_bak_dir(char *fullpath)
  			} else {
  				do_lchown(fullpath, st.st_uid, st.st_gid);
@@ -1159,7 +1159,7 @@ After applying this patch, run these commands for a successful build:
  			}
  		}
  		*p = '/';
-@@ -165,6 +166,8 @@ static int keep_backup(char *fname)
+@@ -167,6 +168,8 @@ static int keep_backup(char *fname)
  		return 0;
  	}
  
@@ -1168,7 +1168,7 @@ After applying this patch, run these commands for a successful build:
  #ifdef HAVE_MKNOD
  	/* Check to see if this is a device file, or link */
  	if (IS_DEVICE(file->mode)) {
-@@ -235,6 +238,7 @@ static int keep_backup(char *fname)
+@@ -237,6 +240,7 @@ static int keep_backup(char *fname)
  		}
  	}
  	set_perms(backup_dir_buf, file, NULL, 0);
@@ -1177,7 +1177,7 @@ After applying this patch, run these commands for a successful build:
  
  	if (verbose > 1)
 --- configure.in	30 Apr 2004 18:03:33 -0000	1.196
-+++ configure.in	6 Jun 2004 21:11:46 -0000
++++ configure.in	18 Jun 2004 17:21:45 -0000
 @@ -434,6 +434,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
      AC_CHECK_LIB(resolv, strcasecmp)
  fi
@@ -1265,9 +1265,9 @@ After applying this patch, run these commands for a successful build:
  AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
  AC_OUTPUT
  
---- flist.c	29 May 2004 21:21:17 -0000	1.226
-+++ flist.c	6 Jun 2004 21:11:47 -0000
-@@ -927,6 +927,8 @@ void send_file_name(int f, struct file_l
+--- flist.c	18 Jun 2004 16:29:21 -0000	1.231
++++ flist.c	18 Jun 2004 17:21:46 -0000
+@@ -945,6 +945,8 @@ void send_file_name(int f, struct file_l
  
  	if (!file)
  		return;
@@ -1276,7 +1276,7 @@ After applying this patch, run these commands for a successful build:
  
  	maybe_emit_filelist_progress(flist);
  
-@@ -938,6 +940,10 @@ void send_file_name(int f, struct file_l
+@@ -956,6 +958,10 @@ void send_file_name(int f, struct file_l
  	if (file->basename[0]) {
  		flist->files[flist->count++] = file;
  		send_file_entry(file, f, base_flags);
@@ -1287,7 +1287,7 @@ After applying this patch, run these commands for a successful build:
  	}
  
  	if (recursive && S_ISDIR(file->mode)
-@@ -1255,6 +1261,8 @@ struct file_list *recv_file_list(int f)
+@@ -1274,6 +1280,8 @@ struct file_list *recv_file_list(int f)
  			flags |= read_byte(f) << 8;
  		receive_file_entry(&flist->files[i], flags, flist, f);
  
@@ -1296,7 +1296,7 @@ After applying this patch, run these commands for a successful build:
  		if (S_ISREG(flist->files[i]->mode))
  			stats.total_size += flist->files[i]->length;
  
-@@ -1277,6 +1285,8 @@ struct file_list *recv_file_list(int f)
+@@ -1296,6 +1304,8 @@ struct file_list *recv_file_list(int f)
  
  	clean_flist(flist, relative_paths, 1);
  
@@ -1305,9 +1305,9 @@ After applying this patch, run these commands for a successful build:
  	if (f != -1) {
  		/* Now send the uid/gid list. This was introduced in
  		 * protocol version 15 */
---- generator.c	5 Jun 2004 16:16:30 -0000	1.86
-+++ generator.c	6 Jun 2004 21:11:47 -0000
-@@ -353,6 +353,10 @@ void recv_generator(char *fname, struct 
+--- generator.c	18 Jun 2004 16:30:24 -0000	1.88
++++ generator.c	18 Jun 2004 17:21:46 -0000
+@@ -345,6 +345,10 @@ void recv_generator(char *fname, struct 
  		if (set_perms(fname, file, statret ? NULL : &st, 0)
  		    && verbose && f_out != -1)
  			rprintf(FINFO,"%s/\n",fname);
@@ -1319,7 +1319,7 @@ After applying this patch, run these commands for a successful build:
  	}
  
 --- mkproto.awk	1 Jan 2004 21:10:50 -0000	1.6
-+++ mkproto.awk	6 Jun 2004 21:11:47 -0000
++++ mkproto.awk	18 Jun 2004 17:21:46 -0000
 @@ -58,7 +58,7 @@ BEGIN {
    next;
  }
@@ -1329,8 +1329,8 @@ After applying this patch, run these commands for a successful build:
    next;
  }
  
---- options.c	6 Jun 2004 19:02:40 -0000	1.155
-+++ options.c	6 Jun 2004 21:11:47 -0000
+--- options.c	7 Jun 2004 22:05:22 -0000	1.156
++++ options.c	18 Jun 2004 17:21:46 -0000
 @@ -43,6 +43,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
  int preserve_links = 0;
@@ -1386,7 +1386,7 @@ After applying this patch, run these commands for a successful build:
    {"read-batch",       0,  POPT_ARG_STRING, &batch_prefix,  OPT_READ_BATCH, 0, 0 },
    {"write-batch",      0,  POPT_ARG_STRING, &batch_prefix,  OPT_WRITE_BATCH, 0, 0 },
    {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
-@@ -601,6 +609,31 @@ int parse_arguments(int *argc, const cha
+@@ -596,6 +604,31 @@ int parse_arguments(int *argc, const cha
  			return 0;
  #endif
  
@@ -1418,7 +1418,7 @@ After applying this patch, run these commands for a successful build:
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off (opt-BASE is its index). */
-@@ -838,6 +871,8 @@ void server_options(char **args,int *arg
+@@ -833,6 +866,8 @@ void server_options(char **args,int *arg
  
  	if (preserve_hard_links)
  		argstr[x++] = 'H';
@@ -1427,8 +1427,8 @@ After applying this patch, run these commands for a successful build:
  	if (preserve_uid)
  		argstr[x++] = 'o';
  	if (preserve_gid)
---- rsync.c	21 May 2004 08:43:03 -0000	1.140
-+++ rsync.c	6 Jun 2004 21:11:47 -0000
+--- rsync.c	11 Jun 2004 07:40:45 -0000	1.141
++++ rsync.c	18 Jun 2004 17:21:46 -0000
 @@ -204,6 +204,14 @@ int set_perms(char *fname,struct file_st
  	}
  #endif
@@ -1445,7 +1445,7 @@ After applying this patch, run these commands for a successful build:
  		if (updated)
  			rprintf(FINFO,"%s\n",fname);
 --- rsync.h	16 May 2004 07:28:24 -0000	1.204
-+++ rsync.h	6 Jun 2004 21:11:47 -0000
++++ rsync.h	18 Jun 2004 17:21:47 -0000
 @@ -538,6 +538,40 @@ static inline int flist_up(struct file_l
  #include "lib/permstring.h"
  #include "lib/addrinfo.h"
@@ -1488,7 +1488,7 @@ After applying this patch, run these commands for a successful build:
  
  /* We have replacement versions of these if they're missing. */
 --- rsync.yo	5 Jun 2004 16:16:30 -0000	1.171
-+++ rsync.yo	6 Jun 2004 21:11:48 -0000
++++ rsync.yo	18 Jun 2004 17:21:47 -0000
 @@ -296,6 +296,7 @@ verb(
       --safe-links            ignore "unsafe" symlinks
   -H, --hard-links            preserve hard links
@@ -1510,7 +1510,7 @@ After applying this patch, run these commands for a successful build:
  destination file to be the same as the source file.  On most systems,
  only the super-user can set file ownership.  By default, the preservation
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ smb_acls.h	6 Jun 2004 21:11:48 -0000
++++ smb_acls.h	18 Jun 2004 17:21:47 -0000
 @@ -0,0 +1,277 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -1790,7 +1790,7 @@ After applying this patch, run these commands for a successful build:
 +#endif /* No ACLs. */
 +#endif /* _SMB_ACLS_H */
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ sysacls.c	6 Jun 2004 21:11:49 -0000
++++ sysacls.c	18 Jun 2004 17:21:48 -0000
 @@ -0,0 +1,3117 @@
 +/*
 +   Unix SMB/Netbios implementation.
@@ -4910,7 +4910,7 @@ After applying this patch, run these commands for a successful build:
 +
 +#endif /* No ACLs. */
 --- uidlist.c	28 Apr 2004 17:31:31 -0000	1.24
-+++ uidlist.c	6 Jun 2004 21:11:49 -0000
++++ uidlist.c	18 Jun 2004 17:21:48 -0000
 @@ -34,6 +34,7 @@
  extern int verbose;
  extern int preserve_uid;