X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/1898c899a144a088965c5236f980b5f2fadb6c19..7ce3d7e01bfcf6c44c7e31354759dae630920fd4:/slp.diff

diff --git a/slp.diff b/slp.diff
index 58ac853..5105682 100644
--- a/slp.diff
+++ b/slp.diff
@@ -1,7 +1,8 @@
 This adds Service Location Protocol support.
 
-After applying this patch, run these commands for a successful build:
+To use this patch, run these commands for a successful build:
 
+    patch -p1 <patches/slp.diff
     ./prepare-source
     ./configure --enable-slp
     make
@@ -11,7 +12,7 @@ and we can't honor that request.
 
 --- old/Makefile.in
 +++ new/Makefile.in
-@@ -12,6 +12,8 @@ CFLAGS=@CFLAGS@
+@@ -13,6 +13,8 @@ CFLAGS=@CFLAGS@
  CPPFLAGS=@CPPFLAGS@
  EXEEXT=@EXEEXT@
  LDFLAGS=@LDFLAGS@
@@ -20,16 +21,16 @@ and we can't honor that request.
  
  INSTALLCMD=@INSTALL@
  INSTALLMAN=@INSTALL@
-@@ -35,7 +37,7 @@ OBJS1=rsync.o generator.o receiver.o cle
- OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
- 	fileio.o batch.o clientname.o chmod.o
+@@ -36,7 +38,7 @@ OBJS1=flist.o rsync.o generator.o receiv
+ OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o \
+ 	fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
  OBJS3=progress.o pipe.o
 -DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
 +DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o $(SLPOBJ)
  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@
-@@ -69,7 +71,7 @@ install-strip:
+@@ -72,7 +74,7 @@ install-strip:
  	$(MAKE) INSTALL_STRIP='-s' install
  
  rsync$(EXEEXT): $(OBJS)
@@ -40,7 +41,7 @@ and we can't honor that request.
  
 --- old/clientserver.c
 +++ new/clientserver.c
-@@ -846,6 +846,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??? */
  
@@ -56,7 +57,7 @@ and we can't honor that request.
  		int fd;
 --- old/configure.in
 +++ new/configure.in
-@@ -559,6 +559,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
  
@@ -88,17 +89,17 @@ and we can't honor that request.
  #include <sys/types.h>
 --- old/loadparm.c
 +++ new/loadparm.c
-@@ -105,6 +105,9 @@ typedef struct
+@@ -107,6 +107,9 @@ typedef struct
  	char *socket_options;
  
  	int rsync_port;
 +#ifdef HAVE_LIBSLP
 +	int slp_refresh;
 +#endif
- 	int syslog_facility;
  } global;
  
-@@ -286,6 +289,9 @@ static struct parm_struct parm_table[] =
+ static global Globals;
+@@ -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},
@@ -106,21 +107,21 @@ and we can't honor that request.
 + {"slp refresh",       P_INTEGER,P_GLOBAL,&Globals.slp_refresh,        NULL,0},
 +#endif
   {"socket options",    P_STRING, P_GLOBAL,&Globals.socket_options,     NULL,0},
-  {"syslog facility",   P_ENUM,   P_GLOBAL,&Globals.syslog_facility,enum_facilities,0},
  
-@@ -379,6 +385,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.p
+  {"auth users",        P_STRING, P_LOCAL, &sDefault.auth_users,        NULL,0},
+@@ -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)
 +#ifdef HAVE_LIBSLP
 +FN_GLOBAL_INTEGER(lp_slp_refresh, &Globals.slp_refresh)
 +#endif
- FN_GLOBAL_INTEGER(lp_syslog_facility, &Globals.syslog_facility)
  
  FN_LOCAL_STRING(lp_auth_users, auth_users)
+ FN_LOCAL_STRING(lp_comment, comment)
 --- old/main.c
 +++ new/main.c
-@@ -1022,6 +1022,18 @@ static int start_client(int argc, char *
+@@ -1076,6 +1076,18 @@ static int start_client(int argc, char *
  
  	if (!read_batch) { /* for read_batch, NO source is specified */
  		shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
@@ -141,40 +142,38 @@ and we can't honor that request.
  			int dummy2;
 --- old/options.c
 +++ new/options.c
-@@ -200,6 +200,7 @@ static void print_rsync_version(enum log
- 	char const *hardlinks = "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
-@@ -222,6 +223,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
-+
- 	rprintf(f, "%s  version %s  protocol version %d\n",
- 		RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
- 	rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
-@@ -234,9 +239,9 @@ static void print_rsync_version(enum log
- 	/* Note that this field may not have type ino_t.  It depends
- 	 * on the complicated interaction between largefile feature
- 	 * macros. */
--	rprintf(f, "              %sinplace, %sIPv6, "
-+	rprintf(f, "              %sinplace, %sIPv6, %sSLP, "
- 		"%d-bit system inums, %d-bit internal inums\n",
--		have_inplace, ipv6,
-+		have_inplace, ipv6, slp,
- 		(int) (sizeof dumstat->st_ino * 8),
- 		(int) (sizeof (int64) * 8));
+ 
+ 	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, %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());
 --- old/rsync.h
 +++ new/rsync.h
-@@ -156,6 +156,9 @@
+@@ -179,6 +179,9 @@
  #define SIGNIFICANT_ITEM_FLAGS (~(\
  	ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
  
@@ -208,7 +207,7 @@ and we can't honor that request.
 +
 --- old/rsyncd.conf.yo
 +++ new/rsyncd.conf.yo
-@@ -119,6 +119,15 @@ details on some of the options you may b
+@@ -103,6 +103,15 @@ details on some of the options you may b
  special socket options are set.  These settings are superseded by the
  bf(--sockopts) command-line option.
  
@@ -224,7 +223,7 @@ and we can't honor that request.
  enddit()
  
  
-@@ -543,6 +552,7 @@ use chroot = no
+@@ -561,6 +570,7 @@ use chroot = no
  max connections = 4
  syslog facility = local5
  pid file = /var/run/rsyncd.pid