From a67395838eaa533051b16d2c7659134089e0ff08 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Sat, 9 Oct 2004 04:39:22 +0000
Subject: [PATCH] A recently added compare_dest check needed to be patched.

---
 compare-dest.diff | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/compare-dest.diff b/compare-dest.diff
index d2c3777..17b95d6 100644
--- a/compare-dest.diff
+++ b/compare-dest.diff
@@ -9,8 +9,8 @@ they are suppled).
 
 Before compiling, be sure to run "make proto".
 
---- orig/generator.c	2004-09-20 19:57:58
-+++ generator.c	2004-07-30 07:28:13
+--- orig/generator.c	2004-10-09 04:06:49
++++ generator.c	2004-10-09 03:35:50
 @@ -45,7 +45,7 @@ extern int io_timeout;
  extern int protocol_version;
  extern int always_checksum;
@@ -20,7 +20,7 @@ Before compiling, be sure to run "make proto".
  extern int link_dest;
  extern int whole_file;
  extern int local_server;
-@@ -426,11 +426,19 @@ static void recv_generator(char *fname, 
+@@ -424,11 +424,19 @@ static void recv_generator(char *fname, 
  	fnamecmp = fname;
  	fnamecmp_type = G2R_FNAME;
  
@@ -44,7 +44,7 @@ Before compiling, be sure to run "make proto".
  #if HAVE_LINK
  			if (link_dest && !dry_run) {
  				if (do_link(fnamecmpbuf, fname) < 0) {
-@@ -441,15 +449,14 @@ static void recv_generator(char *fname, 
+@@ -439,15 +447,14 @@ static void recv_generator(char *fname, 
  							safe_fname(fname));
  					}
  					fnamecmp = fnamecmpbuf;
@@ -62,7 +62,7 @@ Before compiling, be sure to run "make proto".
  		}
  	}
  
---- orig/main.c	2004-07-22 00:10:43
+--- orig/main.c	2004-10-09 03:25:43
 +++ main.c	2004-07-30 07:23:54
 @@ -59,7 +59,7 @@ extern int filesfrom_fd;
  extern pid_t cleanup_child_pid;
@@ -82,8 +82,8 @@ Before compiling, be sure to run "make proto".
  
  	/* The receiving side mustn't obey this, or an existing symlink that
  	 * points to an identical file won't be replaced by the referent. */
---- orig/options.c	2004-09-23 17:42:07
-+++ options.c	2004-08-13 07:55:37
+--- orig/options.c	2004-10-08 20:16:26
++++ options.c	2004-10-09 03:38:38
 @@ -114,12 +114,13 @@ int write_batch = 0;
  int read_batch = 0;
  int backup_dir_len = 0;
@@ -198,6 +198,15 @@ Before compiling, be sure to run "make proto".
  				goto options_rejected;
  		}
  		if (backup_dir) {
+@@ -827,7 +853,7 @@ int parse_arguments(int *argc, const cha
+ 			 am_server ? "server" : "client");
+ 		return 0;
+ #endif
+-		if (compare_dest) {
++		if (saw_compare_dest || link_dest) {
+ 			snprintf(err_buf, sizeof err_buf,
+ 				 "--inplace does not yet work with %s\n",
+ 				 link_dest ? "--link-dest" : "--compare-dest");
 @@ -894,8 +920,8 @@ int parse_arguments(int *argc, const cha
   **/
  void server_options(char **args,int *argc)
-- 
2.34.1