TODO: the configure changes should abort if the user requests --enable-slp
and we can't honor that request.
+based-on: d64bda1c1e79dc385f194d74f7957ce7cd118654
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
INSTALLCMD=@INSTALL@
INSTALLMAN=@INSTALL@
-@@ -37,7 +39,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
+@@ -38,7 +40,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
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@
-@@ -73,7 +75,7 @@ install-strip:
+@@ -74,7 +76,7 @@ install-strip:
$(MAKE) INSTALL_STRIP='-s' install
rsync$(EXEEXT): $(OBJS)
diff --git a/clientserver.c b/clientserver.c
--- a/clientserver.c
+++ b/clientserver.c
-@@ -1064,6 +1064,13 @@ int daemon_main(void)
+@@ -1164,6 +1164,13 @@ int daemon_main(void)
* address too. In fact, why not just do inet_ntop on the
* local address??? */
start_accept_loop(rsync_port, start_daemon);
return -1;
}
-diff --git a/configure.in b/configure.in
---- a/configure.in
-+++ b/configure.in
-@@ -639,6 +639,29 @@ if test $rsync_cv_can_hardlink_special = yes; then
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -683,6 +683,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
diff --git a/loadparm.c b/loadparm.c
--- a/loadparm.c
+++ b/loadparm.c
-@@ -111,6 +111,9 @@ typedef struct
+@@ -98,6 +98,9 @@ typedef struct {
char *socket_options;
int rsync_port;
+#ifdef HAVE_LIBSLP
+ int slp_refresh;
+#endif
- } global;
+ } global_vars;
- static global Globals;
-@@ -302,6 +305,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},
+ /* This structure describes a single section. Their order must match the
+@@ -312,6 +315,9 @@ static struct parm_struct parm_table[] =
+ {"motd file", P_STRING, P_GLOBAL,&Vars.g.motd_file, NULL,0},
+ {"pid file", P_STRING, P_GLOBAL,&Vars.g.pid_file, NULL,0},
+ {"port", P_INTEGER,P_GLOBAL,&Vars.g.rsync_port, NULL,0},
+#ifdef HAVE_LIBSLP
-+ {"slp refresh", P_INTEGER,P_GLOBAL,&Globals.slp_refresh, NULL,0},
++ {"slp refresh", P_INTEGER,P_GLOBAL,&Vars.g.slp_refresh, NULL,0},
+#endif
- {"socket options", P_STRING, P_GLOBAL,&Globals.socket_options, NULL,0},
+ {"socket options", P_STRING, P_GLOBAL,&Vars.g.socket_options, NULL,0},
- {"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0},
-@@ -396,6 +402,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.pid_file)
- FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options)
+ {"auth users", P_STRING, P_LOCAL, &Vars.l.auth_users, NULL,0},
+@@ -443,6 +449,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Vars.g.pid_file)
+ FN_GLOBAL_STRING(lp_socket_options, &Vars.g.socket_options)
- FN_GLOBAL_INTEGER(lp_rsync_port, &Globals.rsync_port)
+ FN_GLOBAL_INTEGER(lp_rsync_port, &Vars.g.rsync_port)
+#ifdef HAVE_LIBSLP
-+FN_GLOBAL_INTEGER(lp_slp_refresh, &Globals.slp_refresh)
++FN_GLOBAL_INTEGER(lp_slp_refresh, &Vars.g.slp_refresh)
+#endif
FN_LOCAL_STRING(lp_auth_users, auth_users)
diff --git a/main.c b/main.c
--- a/main.c
+++ b/main.c
-@@ -1121,6 +1121,18 @@ static int start_client(int argc, char *argv[])
+@@ -1237,6 +1237,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);
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -225,6 +225,7 @@ static void print_rsync_version(enum logcode f)
+@@ -568,6 +568,7 @@ static void print_rsync_version(enum logcode f)
char const *links = "no ";
char const *iconv = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
#if SUBPROTOCOL_VERSION != 0
-@@ -258,6 +259,9 @@ static void print_rsync_version(enum logcode f)
- #if defined HAVE_LUTIMES && defined HAVE_UTIMES
+@@ -601,6 +602,9 @@ static void print_rsync_version(enum logcode f)
+ #ifdef CAN_SET_SYMLINK_TIMES
symtimes = "";
#endif
+#if HAVE_LIBSLP
rprintf(f, "%s version %s protocol version %d%s\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
-@@ -271,8 +275,8 @@ static void print_rsync_version(enum logcode f)
+@@ -614,8 +618,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);
diff --git a/rsync.h b/rsync.h
--- a/rsync.h
+++ b/rsync.h
-@@ -193,6 +193,10 @@
+@@ -199,6 +199,10 @@
#define SIGNIFICANT_ITEM_FLAGS (~(\
ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
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
+@@ -120,6 +120,15 @@ details on some of the options you may be able to set. By default no
special socket options are set. These settings can also be specified
via the bf(--sockopts) command-line option.
enddit()
manpagesection(MODULE PARAMETERS)
-@@ -652,6 +661,7 @@ use chroot = yes
+@@ -768,6 +777,7 @@ use chroot = yes
max connections = 4
syslog facility = local5
pid file = /var/run/rsyncd.pid
diff --git a/socket.c b/socket.c
--- a/socket.c
+++ b/socket.c
-@@ -530,6 +530,16 @@ void start_accept_loop(int port, int (*fn)(int, int))
+@@ -515,6 +515,16 @@ void start_accept_loop(int port, int (*fn)(int, int))
{
fd_set deffds;
int *sp, maxfd, i;
#ifdef HAVE_SIGACTION
sigact.sa_flags = SA_NOCLDSTOP;
-@@ -558,14 +568,25 @@ void start_accept_loop(int port, int (*fn)(int, int))
+@@ -543,14 +553,25 @@ void start_accept_loop(int port, int (*fn)(int, int))
maxfd = sp[i];
}
/* close log file before the potentially very long select so
* file can be trimmed by another process instead of growing
-@@ -577,8 +598,18 @@ void start_accept_loop(int port, int (*fn)(int, int))
- #else
+@@ -563,7 +584,18 @@ void start_accept_loop(int port, int (*fn)(int, int))
fds = deffds;
#endif
--
-- if (select(maxfd + 1, &fds, NULL, NULL, NULL) != 1)
+
+- if (select(maxfd + 1, &fds, NULL, NULL, NULL) < 1)
+#ifdef HAVE_LIBSLP
+ sel_ret = select(maxfd + 1, &fds, NULL, NULL,
+ slp_timeout ? &slp_tv : NULL);
+ if (sel_ret == 0 && slp_timeout && time(NULL) > next_slp_refresh) {
-+ rprintf(FINFO, "Service registration expired, refreshing it\n");
-+ register_services();
-+ next_slp_refresh = time(NULL) + slp_timeout;
++ rprintf(FINFO, "Service registration expired, refreshing it\n");
++ register_services();
++ next_slp_refresh = time(NULL) + slp_timeout;
+ }
+#else
+ sel_ret = select(maxfd + 1, &fds, NULL, NULL, NULL);
+#endif
-+ if (sel_ret != 1)
++ if (sel_ret < 1)
continue;
for (i = 0, fd = -1; sp[i] >= 0; i++) {
git.samba.org / rsync-patches.git / blobdiff