X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/72e5645e95d7fd7edd0c4ab59f9812b9d6124521..c1ff70aa47e11c5b37634479a0facee775a7b6d9:/slp.diff

diff --git a/slp.diff b/slp.diff
index 4d6baa9..e81fb8b 100644
--- a/slp.diff
+++ b/slp.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
 TODO: the configure changes should abort if the user requests --enable-slp
 and we can't honor that request.
 
-based-on: 3b8f8192227b14e708bf535072485e50f4362270
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -44,7 +44,7 @@ diff --git a/Makefile.in b/Makefile.in
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
-@@ -1156,6 +1156,13 @@ int daemon_main(void)
+@@ -1159,6 +1159,13 @@ int daemon_main(void)
  	 * address too.  In fact, why not just do inet_ntop on the
  	 * local address??? */
  
@@ -61,7 +61,7 @@ diff --git a/clientserver.c b/clientserver.c
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -668,6 +668,29 @@ if test $rsync_cv_can_hardlink_special = yes; then
+@@ -683,6 +683,29 @@ if test $rsync_cv_can_hardlink_special = yes; then
      AC_DEFINE(CAN_HARDLINK_SPECIAL, 1, [Define to 1 if link() can hard-link special files.])
  fi
  
@@ -127,7 +127,7 @@ diff --git a/loadparm.c b/loadparm.c
 diff --git a/main.c b/main.c
 --- a/main.c
 +++ b/main.c
-@@ -1213,6 +1213,18 @@ static int start_client(int argc, char *argv[])
+@@ -1238,6 +1238,18 @@ static int start_client(int argc, char *argv[])
  
  	if (!read_batch) { /* for read_batch, NO source is specified */
  		char *path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
@@ -181,7 +181,7 @@ diff --git a/options.c b/options.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -197,6 +197,10 @@
+@@ -199,6 +199,10 @@
  #define SIGNIFICANT_ITEM_FLAGS (~(\
  	ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))