X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/f9df736a3e22f15307f9e304eb9069b06e94208f..c0c7984e7f6009b6ab18ad3da998a56a9c0f083d:/slp.diff

diff --git a/slp.diff b/slp.diff
index f509693..9832370 100644
--- a/slp.diff
+++ b/slp.diff
@@ -43,7 +43,7 @@ diff --git a/Makefile.in b/Makefile.in
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
-@@ -1032,6 +1032,13 @@ int daemon_main(void)
+@@ -1068,6 +1068,13 @@ int daemon_main(void)
  	 * address too.  In fact, why not just do inet_ntop on the
  	 * local address??? */
  
@@ -60,7 +60,7 @@ diff --git a/clientserver.c b/clientserver.c
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -637,6 +637,29 @@ if test $rsync_cv_can_hardlink_special = yes; then
+@@ -639,6 +639,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
  
@@ -126,7 +126,7 @@ diff --git a/loadparm.c b/loadparm.c
 diff --git a/main.c b/main.c
 --- a/main.c
 +++ b/main.c
-@@ -1146,6 +1146,18 @@ static int start_client(int argc, char *argv[])
+@@ -1112,6 +1112,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);
@@ -148,7 +148,7 @@ diff --git a/main.c b/main.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -224,6 +224,7 @@ static void print_rsync_version(enum logcode f)
+@@ -225,6 +225,7 @@ static void print_rsync_version(enum logcode f)
  	char const *links = "no ";
  	char const *iconv = "no ";
  	char const *ipv6 = "no ";
@@ -156,7 +156,7 @@ diff --git a/options.c b/options.c
  	STRUCT_STAT *dumstat;
  
  #if SUBPROTOCOL_VERSION != 0
-@@ -256,6 +257,9 @@ static void print_rsync_version(enum logcode f)
+@@ -257,6 +258,9 @@ static void print_rsync_version(enum logcode f)
  #if defined HAVE_LUTIMES && defined HAVE_UTIMES
  	symtimes = "";
  #endif
@@ -166,7 +166,7 @@ diff --git a/options.c b/options.c
  
  	rprintf(f, "%s  version %s  protocol version %d%s\n",
  		RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
-@@ -269,8 +273,8 @@ static void print_rsync_version(enum logcode f)
+@@ -270,8 +274,8 @@ static void print_rsync_version(enum logcode f)
  		(int)(sizeof (int64) * 8));
  	rprintf(f, "    %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
  		got_socketpair, hardlinks, links, ipv6, have_inplace);
@@ -180,7 +180,7 @@ diff --git a/options.c b/options.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -187,6 +187,10 @@
+@@ -190,6 +190,10 @@
  #define SIGNIFICANT_ITEM_FLAGS (~(\
  	ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
  
@@ -188,7 +188,7 @@ diff --git a/rsync.h b/rsync.h
 +/* definately don't set to less than about 30 seconds */
 +#define SLP_MIN_TIMEOUT 120
 +
- #define CFN_KEEP_LEADING_DOT_DIR (1<<0)
+ #define CFN_KEEP_DOT_DIRS (1<<0)
  #define CFN_KEEP_TRAILING_SLASH (1<<1)
  #define CFN_DROP_TRAILING_DOT_DIR (1<<2)
 diff --git a/rsync.yo b/rsync.yo
@@ -235,7 +235,7 @@ diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
  enddit()
  
  
-@@ -654,6 +663,7 @@ use chroot = yes
+@@ -652,6 +661,7 @@ use chroot = yes
  max connections = 4
  syslog facility = local5
  pid file = /var/run/rsyncd.pid