INSTALLCMD=@INSTALL@
INSTALLMAN=@INSTALL@
-@@ -36,7 +38,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 hashtable.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@
-@@ -70,7 +72,7 @@ install-strip:
+@@ -72,7 +74,7 @@ install-strip:
$(MAKE) INSTALL_STRIP='-s' install
rsync$(EXEEXT): $(OBJS)
--- old/clientserver.c
+++ new/clientserver.c
-@@ -849,6 +849,13 @@ int daemon_main(void)
+@@ -927,6 +927,13 @@ int daemon_main(void)
* address too. In fact, why not just do inet_ntop on the
* local address??? */
+ }
+#endif
+
- if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) {
- char pidbuf[16];
- int fd;
+ start_accept_loop(rsync_port, start_daemon);
+ return -1;
+ }
--- old/configure.in
+++ new/configure.in
-@@ -592,6 +592,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
#include <sys/types.h>
--- old/loadparm.c
+++ new/loadparm.c
-@@ -108,6 +108,9 @@ typedef struct
+@@ -111,6 +111,9 @@ typedef struct
char *socket_options;
int rsync_port;
} global;
static global Globals;
-@@ -291,6 +294,9 @@ static struct parm_struct parm_table[] =
+@@ -296,6 +299,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},
{"socket options", P_STRING, P_GLOBAL,&Globals.socket_options, NULL,0},
{"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0},
-@@ -381,6 +387,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.p
+@@ -387,6 +393,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)
FN_LOCAL_STRING(lp_comment, comment)
--- old/main.c
+++ new/main.c
-@@ -1058,6 +1058,18 @@ static int start_client(int argc, char *
+@@ -1125,6 +1125,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);
+ char *path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
+
+ if (shell_machine && !shell_machine[0]) {
+#ifdef HAVE_LIBSLP
+#endif
+ }
+
- if (shell_path) { /* source is remote */
- char *dummy1;
- int dummy2;
+ if (path) { /* source is remote */
+ char *dummy_host;
+ int dummy_port = 0;
--- old/options.c
+++ new/options.c
-@@ -201,6 +201,7 @@ static void print_rsync_version(enum log
- char const *hardlinks = "no ";
+@@ -221,6 +221,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
-@@ -223,6 +224,10 @@ static void print_rsync_version(enum log
- ipv6 = "";
+ #if SUBPROTOCOL_VERSION != 0
+@@ -250,6 +251,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");
-@@ -235,9 +240,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);
+@@ -263,8 +267,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
-@@ -157,6 +157,9 @@
+@@ -182,6 +182,9 @@
#define SIGNIFICANT_ITEM_FLAGS (~(\
ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
* but FLOG and FSOCKERR can be sent over the receiver -> generator pipe.
--- old/rsync.yo
+++ new/rsync.yo
-@@ -139,7 +139,12 @@ particular rsync daemon by leaving off t
+@@ -145,7 +145,12 @@ particular rsync daemon by leaving off t
quote(tt(rsync somehost.mydomain.com::))
enddit()
-@@ -556,6 +565,7 @@ use chroot = no
+@@ -565,6 +574,7 @@ use chroot = no
max connections = 4
syslog facility = local5
pid file = /var/run/rsyncd.pid
path = /var/ftp/pub
--- old/socket.c
+++ new/socket.c
-@@ -466,6 +466,16 @@ void start_accept_loop(int port, int (*f
+@@ -502,6 +502,16 @@ void start_accept_loop(int port, int (*f
{
fd_set deffds;
int *sp, maxfd, i;
#ifdef HAVE_SIGACTION
sigact.sa_flags = SA_NOCLDSTOP;
-@@ -494,14 +504,25 @@ void start_accept_loop(int port, int (*f
+@@ -530,14 +540,25 @@ void start_accept_loop(int port, int (*f
maxfd = sp[i];
}
/* close log file before the potentially very long select so
* file can be trimmed by another process instead of growing
-@@ -513,8 +534,18 @@ void start_accept_loop(int port, int (*f
+@@ -549,8 +570,18 @@ void start_accept_loop(int port, int (*f
#else
fds = deffds;
#endif