--- old/clientserver.c
+++ new/clientserver.c
-@@ -927,6 +927,13 @@ int daemon_main(void)
+@@ -952,6 +952,13 @@ int daemon_main(void)
* address too. In fact, why not just do inet_ntop on the
* local address??? */
}
--- old/configure.in
+++ new/configure.in
-@@ -641,6 +641,29 @@ if test $rsync_cv_can_hardlink_special =
+@@ -625,6 +625,29 @@ if test $rsync_cv_can_hardlink_special =
AC_DEFINE(CAN_HARDLINK_SPECIAL, 1, [Define to 1 if link() can hard-link special files.])
fi
FN_LOCAL_STRING(lp_comment, comment)
--- old/main.c
+++ new/main.c
-@@ -1125,6 +1125,18 @@ static int start_client(int argc, char *
+@@ -1139,6 +1139,18 @@ static int start_client(int argc, char *
if (!read_batch) { /* for read_batch, NO source is specified */
char *path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
--- old/rsync.h
+++ new/rsync.h
-@@ -182,6 +182,9 @@
+@@ -183,6 +183,10 @@
#define SIGNIFICANT_ITEM_FLAGS (~(\
ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
+/* this is the minimum we'll use, irrespective of config setting */
+/* definately don't set to less than about 30 seconds */
+#define SLP_MIN_TIMEOUT 120
-
- /* Log-message categories. Only FERROR and FINFO get sent over the socket,
- * but FLOG and FSOCKERR can be sent over the receiver -> generator pipe.
++
+ #define CFN_KEEP_LEADING_DOT_DIR (1<<0)
+ #define CFN_KEEP_TRAILING_SLASH (1<<1)
+ #define CFN_DROP_TRAILING_DOT_DIR (1<<2)
--- old/rsync.yo
+++ new/rsync.yo
-@@ -145,7 +145,12 @@ particular rsync daemon by leaving off t
+@@ -144,7 +144,12 @@ particular rsync daemon by leaving off t
quote(tt(rsync somehost.mydomain.com::))
+
--- old/rsyncd.conf.yo
+++ new/rsyncd.conf.yo
-@@ -103,6 +103,15 @@ details on some of the options you may b
+@@ -104,6 +104,15 @@ details on some of the options you may b
special socket options are set. These settings are superseded by the
bf(--sockopts) command-line option.
enddit()
-@@ -565,6 +574,7 @@ use chroot = no
+@@ -566,6 +575,7 @@ use chroot = no
max connections = 4
syslog facility = local5
pid file = /var/run/rsyncd.pid