X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/82c2230a445b352ac67f3ed13bf7fa88b0bbac70..0b2c07a0f162b8704df278209b4de836f1c846de:/slp.diff

diff --git a/slp.diff b/slp.diff
index 90a86a0..5105682 100644
--- a/slp.diff
+++ b/slp.diff
@@ -30,7 +30,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@
-@@ -70,7 +72,7 @@ install-strip:
+@@ -72,7 +74,7 @@ install-strip:
  	$(MAKE) INSTALL_STRIP='-s' install
  
  rsync$(EXEEXT): $(OBJS)
@@ -41,7 +41,7 @@ and we can't honor that request.
  
 --- old/clientserver.c
 +++ new/clientserver.c
-@@ -854,6 +854,13 @@ int daemon_main(void)
+@@ -858,6 +858,13 @@ int daemon_main(void)
  	 * address too.  In fact, why not just do inet_ntop on the
  	 * local address??? */
  
@@ -57,7 +57,7 @@ and we can't honor that request.
  		int fd;
 --- old/configure.in
 +++ new/configure.in
-@@ -625,6 +625,29 @@ if test $rsync_cv_can_hardlink_special =
+@@ -641,6 +641,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
  
@@ -99,7 +99,7 @@ and we can't honor that request.
  } global;
  
  static global Globals;
-@@ -290,6 +293,9 @@ static struct parm_struct parm_table[] =
+@@ -292,6 +295,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 +109,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},
-@@ -380,6 +386,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.p
+@@ -383,6 +389,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.p
  FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options)
  
  FN_GLOBAL_INTEGER(lp_rsync_port, &Globals.rsync_port)
@@ -142,33 +142,32 @@ and we can't honor that request.
  			int dummy2;
 --- old/options.c
 +++ new/options.c
-@@ -206,6 +206,7 @@ static void print_rsync_version(enum log
- 	char const *xattrs = "no ";
+@@ -212,6 +212,7 @@ static void print_rsync_version(enum log
  	char const *links = "no ";
+ 	char const *iconv = "no ";
  	char const *ipv6 = "no ";
 +	char const *slp = "no ";
  	STRUCT_STAT *dumstat;
  
- #ifdef HAVE_SOCKETPAIR
-@@ -234,6 +235,10 @@ static void print_rsync_version(enum log
- 	ipv6 = "";
+ #if SUBPROTOCOL_VERSION != 0
+@@ -241,6 +242,9 @@ static void print_rsync_version(enum log
+ #ifdef ICONV_OPTION
+ 	iconv = "";
  #endif
- 
 +#if HAVE_LIBSLP
 +	slp = "";
 +#endif
-+
- 	if (SUBPROTOCOL_VERSION)
- 		snprintf(buf, sizeof buf, ".PR%d", SUBPROTOCOL_VERSION);
- 	else
-@@ -250,8 +255,8 @@ static void print_rsync_version(enum log
+ 
+ 	rprintf(f, "%s  version %s  protocol version %d%s\n",
+ 		RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
+@@ -254,8 +258,8 @@ static void print_rsync_version(enum log
  		(int)(sizeof (int64) * 8));
  	rprintf(f, "    %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
  		got_socketpair, hardlinks, links, ipv6, have_inplace);
--	rprintf(f, "    %sappend, %sACLs, %sxattrs\n",
--		have_inplace, acls, xattrs);
-+	rprintf(f, "    %sappend, %sACLs, %sxattrs, %sSLP\n",
-+		have_inplace, acls, xattrs, slp);
+-	rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv\n",
+-		have_inplace, acls, xattrs, iconv);
++	rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv, %sSLP\n",
++		have_inplace, acls, xattrs, iconv, slp);
  
  #ifdef MAINTAINER_MODE
  	rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
@@ -224,7 +223,7 @@ and we can't honor that request.
  enddit()
  
  
-@@ -556,6 +565,7 @@ use chroot = no
+@@ -561,6 +570,7 @@ use chroot = no
  max connections = 4
  syslog facility = local5
  pid file = /var/run/rsyncd.pid