Updated to work with latest io.c changes.

[rsync/rsync-patches.git] / slp.diff

diff --git a/slp.diff b/slp.diff
index ae9c0ad..1410e7c 100644 (file)
--- a/slp.diff
+++ b/slp.diff
@@ -40,7 +40,7 @@ and we can't honor that request.
  
 --- old/clientserver.c
 +++ new/clientserver.c
-@@ -836,6 +836,13 @@ int daemon_main(void)
+@@ -847,6 +847,13 @@ int daemon_main(void)
         * address too.  In fact, why not just do inet_ntop on the
         * local address??? */
  
@@ -120,9 +120,9 @@ and we can't honor that request.
  FN_LOCAL_STRING(lp_auth_users, auth_users)
 --- old/main.c
 +++ new/main.c
-@@ -962,6 +962,18 @@ static int start_client(int argc, char *
+@@ -971,6 +971,18 @@ static int start_client(int argc, char *
+ 
        if (!read_batch) { /* for read_batch, NO source is specified */
-               argc--;
                shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
 +
 +              if (shell_machine && !shell_machine[0]) {
@@ -186,7 +186,7 @@ and we can't honor that request.
   * FLOG and FCLIENT are only used on the daemon side for custom logging,
 --- old/rsync.yo
 +++ new/rsync.yo
-@@ -137,7 +137,12 @@ particular rsync daemon by leaving off t
+@@ -139,7 +139,12 @@ particular rsync daemon by leaving off t
  
  quote(tt(rsync somehost.mydomain.com::))
  
@@ -224,7 +224,7 @@ and we can't honor that request.
  enddit()
  
  
-@@ -544,6 +553,7 @@ use chroot = no
+@@ -543,6 +552,7 @@ use chroot = no
  max connections = 4
  syslog facility = local5
  pid file = /var/run/rsyncd.pid