X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/cbdf862c63c8b1b764247668a83430da0bf49559..0ef5abcbbb95298fa9faf1d3eb275a9e76e1d951:/slp.diff

diff --git a/slp.diff b/slp.diff
index 8d0815c..6c6bc4e 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
-@@ -1068,6 +1068,13 @@ int daemon_main(void)
+@@ -1064,6 +1064,13 @@ int daemon_main(void)
  	 * address too.  In fact, why not just do inet_ntop on the
  	 * local address??? */
  
@@ -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
-@@ -1112,6 +1112,18 @@ static int start_client(int argc, char *argv[])
+@@ -1121,6 +1121,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);
@@ -156,7 +156,7 @@ diff --git a/options.c b/options.c
  	STRUCT_STAT *dumstat;
  
  #if SUBPROTOCOL_VERSION != 0
-@@ -257,6 +258,9 @@ static void print_rsync_version(enum logcode f)
+@@ -258,6 +259,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);
-@@ -270,8 +274,8 @@ static void print_rsync_version(enum logcode f)
+@@ -271,8 +275,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
-@@ -191,6 +191,10 @@
+@@ -193,6 +193,10 @@
  #define SIGNIFICANT_ITEM_FLAGS (~(\
  	ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
  
@@ -194,7 +194,7 @@ diff --git a/rsync.h b/rsync.h
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo
-@@ -144,7 +144,12 @@ particular rsync daemon by leaving off the module name:
+@@ -148,7 +148,12 @@ particular rsync daemon by leaving off the module name:
  
  quote(tt(rsync somehost.mydomain.com::))
  
@@ -220,12 +220,12 @@ 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 option is used to determine how long service
++dit(bf(slp refresh)) This parameter is used to determine how long service
 +advertisements are valid (measured in seconds), and is only applicable if
-+you have Service Location Protocol support compiled in. If this option is
++you have Service Location Protocol support compiled in. If this is
 +not set or is set to zero, then service advertisements never time out. If
 +this is set to less than 120 seconds, then 120 seconds is used. If it is
 +set to more than 65535, then 65535 is used (which is a limitation of SLP).
@@ -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
@@ -246,7 +246,7 @@ diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
 diff --git a/socket.c b/socket.c
 --- a/socket.c
 +++ b/socket.c
-@@ -524,6 +524,16 @@ void start_accept_loop(int port, int (*fn)(int, int))
+@@ -530,6 +530,16 @@ void start_accept_loop(int port, int (*fn)(int, int))
  {
  	fd_set deffds;
  	int *sp, maxfd, i;
@@ -263,7 +263,7 @@ diff --git a/socket.c b/socket.c
  
  #ifdef HAVE_SIGACTION
  	sigact.sa_flags = SA_NOCLDSTOP;
-@@ -552,14 +562,25 @@ void start_accept_loop(int port, int (*fn)(int, int))
+@@ -558,14 +568,25 @@ void start_accept_loop(int port, int (*fn)(int, int))
  			maxfd = sp[i];
  	}
  
@@ -289,7 +289,7 @@ diff --git a/socket.c b/socket.c
  
  		/* close log file before the potentially very long select so
  		 * file can be trimmed by another process instead of growing
-@@ -571,8 +592,18 @@ void start_accept_loop(int port, int (*fn)(int, int))
+@@ -577,8 +598,18 @@ void start_accept_loop(int port, int (*fn)(int, int))
  #else
  		fds = deffds;
  #endif