X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/790ba11acdb77fcd3d81ba5749081f79ded86d04..cc3e685d09b2095099fc396157d19172ab3ef7c4:/slp.diff

diff --git a/slp.diff b/slp.diff
index 6a7a37c..a09ebdf 100644
--- a/slp.diff
+++ b/slp.diff
@@ -10,8 +10,9 @@ To use this patch, run these commands for a successful build:
 TODO: the configure changes should abort if the user requests --enable-slp
 and we can't honor that request.
 
---- old/Makefile.in
-+++ new/Makefile.in
+diff --git a/Makefile.in b/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -13,6 +13,8 @@ CFLAGS=@CFLAGS@
  CPPFLAGS=@CPPFLAGS@
  EXEEXT=@EXEEXT@
@@ -21,7 +22,7 @@ and we can't honor that request.
  
  INSTALLCMD=@INSTALL@
  INSTALLMAN=@INSTALL@
-@@ -36,7 +38,7 @@ OBJS1=flist.o rsync.o generator.o receiv
+@@ -37,7 +39,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
  OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
  	fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
  OBJS3=progress.o pipe.o
@@ -30,7 +31,7 @@ and we can't honor that request.
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
  	popt/popthelp.o popt/poptparse.o
  OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@
-@@ -72,7 +74,7 @@ install-strip:
+@@ -73,7 +75,7 @@ install-strip:
  	$(MAKE) INSTALL_STRIP='-s' install
  
  rsync$(EXEEXT): $(OBJS)
@@ -39,9 +40,10 @@ and we can't honor that request.
  
  $(OBJS): $(HEADERS)
  
---- old/clientserver.c
-+++ new/clientserver.c
-@@ -876,6 +876,13 @@ int daemon_main(void)
+diff --git a/clientserver.c b/clientserver.c
+--- a/clientserver.c
++++ b/clientserver.c
+@@ -969,6 +969,13 @@ int daemon_main(void)
  	 * address too.  In fact, why not just do inet_ntop on the
  	 * local address??? */
  
@@ -52,12 +54,13 @@ and we can't honor that request.
 +	}
 +#endif
 +
- 	if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) {
- 		char pidbuf[16];
- 		int fd;
---- old/configure.in
-+++ new/configure.in
-@@ -641,6 +641,29 @@ if test $rsync_cv_can_hardlink_special =
+ 	start_accept_loop(rsync_port, start_daemon);
+ 	return -1;
+ }
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -632,6 +632,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
  
@@ -87,9 +90,10 @@ and we can't honor that request.
  AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[
  AC_TRY_RUN([
  #include <sys/types.h>
---- old/loadparm.c
-+++ new/loadparm.c
-@@ -110,6 +110,9 @@ typedef struct
+diff --git a/loadparm.c b/loadparm.c
+--- a/loadparm.c
++++ b/loadparm.c
+@@ -111,6 +111,9 @@ typedef struct
  	char *socket_options;
  
  	int rsync_port;
@@ -99,7 +103,7 @@ and we can't honor that request.
  } global;
  
  static global Globals;
-@@ -295,6 +298,9 @@ static struct parm_struct parm_table[] =
+@@ -298,6 +301,9 @@ static struct parm_struct parm_table[] =
   {"motd file",         P_STRING, P_GLOBAL,&Globals.motd_file,          NULL,0},
   {"pid file",          P_STRING, P_GLOBAL,&Globals.pid_file,           NULL,0},
   {"port",              P_INTEGER,P_GLOBAL,&Globals.rsync_port,         NULL,0},
@@ -109,7 +113,7 @@ and we can't honor that request.
   {"socket options",    P_STRING, P_GLOBAL,&Globals.socket_options,     NULL,0},
  
   {"auth users",        P_STRING, P_LOCAL, &sDefault.auth_users,        NULL,0},
-@@ -386,6 +392,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.p
+@@ -390,6 +396,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.pid_file)
  FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options)
  
  FN_GLOBAL_INTEGER(lp_rsync_port, &Globals.rsync_port)
@@ -119,9 +123,10 @@ and we can't honor that request.
  
  FN_LOCAL_STRING(lp_auth_users, auth_users)
  FN_LOCAL_STRING(lp_comment, comment)
---- old/main.c
-+++ new/main.c
-@@ -1099,6 +1099,18 @@ static int start_client(int argc, char *
+diff --git a/main.c b/main.c
+--- a/main.c
++++ b/main.c
+@@ -1141,6 +1141,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);
@@ -138,11 +143,12 @@ and we can't honor that request.
 +		}
 +
  		if (path) { /* source is remote */
- 			char *dummy1;
- 			int dummy2;
---- old/options.c
-+++ new/options.c
-@@ -220,6 +220,7 @@ static void print_rsync_version(enum log
+ 			char *dummy_host;
+ 			int dummy_port = 0;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -222,6 +222,7 @@ static void print_rsync_version(enum logcode f)
  	char const *links = "no ";
  	char const *iconv = "no ";
  	char const *ipv6 = "no ";
@@ -150,7 +156,7 @@ and we can't honor that request.
  	STRUCT_STAT *dumstat;
  
  #if SUBPROTOCOL_VERSION != 0
-@@ -249,6 +250,9 @@ static void print_rsync_version(enum log
+@@ -251,6 +252,9 @@ static void print_rsync_version(enum logcode f)
  #ifdef ICONV_OPTION
  	iconv = "";
  #endif
@@ -160,7 +166,7 @@ and we can't honor that request.
  
  	rprintf(f, "%s  version %s  protocol version %d%s\n",
  		RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
-@@ -262,8 +266,8 @@ static void print_rsync_version(enum log
+@@ -264,8 +268,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);
@@ -171,21 +177,24 @@ and we can't honor that request.
  
  #ifdef MAINTAINER_MODE
  	rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
---- old/rsync.h
-+++ new/rsync.h
-@@ -182,6 +182,9 @@
+diff --git a/rsync.h b/rsync.h
+--- a/rsync.h
++++ b/rsync.h
+@@ -186,6 +186,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.
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -145,7 +145,12 @@ particular rsync daemon by leaving off t
++
+ #define CFN_KEEP_LEADING_DOT_DIR (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
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -144,7 +144,12 @@ particular rsync daemon by leaving off the module name:
  
  quote(tt(rsync somehost.mydomain.com::))
  
@@ -199,15 +208,18 @@ and we can't honor that request.
  
  manpagesection(ADVANCED USAGE)
  
---- old/rsyncd.conf
-+++ new/rsyncd.conf
+diff --git a/rsyncd.conf b/rsyncd.conf
+new file mode 100644
+--- /dev/null
++++ b/rsyncd.conf
 @@ -0,0 +1,3 @@
 +
 +slp refresh = 300
 +
---- old/rsyncd.conf.yo
-+++ new/rsyncd.conf.yo
-@@ -103,6 +103,15 @@ details on some of the options you may b
+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.
  
@@ -223,7 +235,7 @@ and we can't honor that request.
  enddit()
  
  
-@@ -564,6 +573,7 @@ use chroot = no
+@@ -603,6 +612,7 @@ use chroot = no
  max connections = 4
  syslog facility = local5
  pid file = /var/run/rsyncd.pid
@@ -231,9 +243,10 @@ and we can't honor that request.
  
  [ftp]
          path = /var/ftp/pub
---- old/socket.c
-+++ new/socket.c
-@@ -501,6 +501,16 @@ void start_accept_loop(int port, int (*f
+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))
  {
  	fd_set deffds;
  	int *sp, maxfd, i;
@@ -250,7 +263,7 @@ and we can't honor that request.
  
  #ifdef HAVE_SIGACTION
  	sigact.sa_flags = SA_NOCLDSTOP;
-@@ -529,14 +539,25 @@ void start_accept_loop(int port, int (*f
+@@ -552,14 +562,25 @@ void start_accept_loop(int port, int (*fn)(int, int))
  			maxfd = sp[i];
  	}
  
@@ -276,7 +289,7 @@ and we can't honor that request.
  
  		/* close log file before the potentially very long select so
  		 * file can be trimmed by another process instead of growing
-@@ -548,8 +569,18 @@ void start_accept_loop(int port, int (*f
+@@ -571,8 +592,18 @@ void start_accept_loop(int port, int (*fn)(int, int))
  #else
  		fds = deffds;
  #endif
@@ -297,8 +310,10 @@ and we can't honor that request.
  			continue;
  
  		for (i = 0, fd = -1; sp[i] >= 0; i++) {
---- old/srvloc.c
-+++ new/srvloc.c
+diff --git a/srvloc.c b/srvloc.c
+new file mode 100644
+--- /dev/null
++++ b/srvloc.c
 @@ -0,0 +1,103 @@
 +/* -*- c-file-style: "linux"; -*-
 +
@@ -403,8 +418,10 @@ and we can't honor that request.
 +
 +	return 0;
 +}
---- old/srvreg.c
-+++ new/srvreg.c
+diff --git a/srvreg.c b/srvreg.c
+new file mode 100644
+--- /dev/null
++++ b/srvreg.c
 @@ -0,0 +1,128 @@
 +/* -*- c-file-style: "linux"; -*-
 +