The patches for 3.0.4pre2.

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

diff --git a/slp.diff b/slp.diff
index 1f4501a..18a0f6e 100644 (file)
--- a/slp.diff
+++ b/slp.diff
@@ -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
-@@ -1121,6 +1121,18 @@ static int start_client(int argc, char *argv[])
+@@ -1126,6 +1126,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);
@@ -220,8 +220,8 @@ diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
 --- a/rsyncd.conf.yo
 +++ b/rsyncd.conf.yo
 @@ -104,6 +104,15 @@ details on some of the options you may be able to set. By default no
- special socket options are set.  These settings are superseded by the
- bf(--sockopts) command-line option.
+ special socket options are set.  These settings can also be specified
+ via the bf(--sockopts) command-line option.
  
 +dit(bf(slp refresh)) This parameter is used to determine how long service
 +advertisements are valid (measured in seconds), and is only applicable if
@@ -234,7 +234,7 @@ diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
 +
  enddit()
  
- 
+ manpagesection(MODULE PARAMETERS)
 @@ -652,6 +661,7 @@ use chroot = yes
  max connections = 4
  syslog facility = local5