TODO: the configure changes should abort if the user requests --enable-slp
and we can't honor that request.
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
diff --git a/Makefile.in b/Makefile.in
-index feacb90..09e1547 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,6 +13,8 @@ CFLAGS=@CFLAGS@
$(OBJS): $(HEADERS)
$(CHECK_OBJS): $(HEADERS)
diff --git a/clientserver.c b/clientserver.c
-index b6afe00..a242809 100644
--- a/clientserver.c
+++ b/clientserver.c
-@@ -1153,6 +1153,13 @@ int daemon_main(void)
+@@ -1159,6 +1159,13 @@ int daemon_main(void)
* address too. In fact, why not just do inet_ntop on the
* local address??? */
return -1;
}
diff --git a/configure.in b/configure.in
-index bc7d4a7..f8dc177 100644
--- a/configure.in
+++ b/configure.in
-@@ -647,6 +647,29 @@ if test $rsync_cv_can_hardlink_special = yes; then
+@@ -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
AC_TRY_RUN([
#include <sys/types.h>
diff --git a/loadparm.c b/loadparm.c
-index 8e48e6d..a833006 100644
--- a/loadparm.c
+++ b/loadparm.c
-@@ -97,6 +97,9 @@ typedef struct {
+@@ -98,6 +98,9 @@ typedef struct {
char *socket_options;
int rsync_port;
} global_vars;
/* This structure describes a single section. Their order must match the
-@@ -311,6 +314,9 @@ static struct parm_struct parm_table[] =
+@@ -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},
{"socket options", P_STRING, P_GLOBAL,&Vars.g.socket_options, NULL,0},
{"auth users", P_STRING, P_LOCAL, &Vars.l.auth_users, NULL,0},
-@@ -392,6 +398,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Vars.g.pid_file)
+@@ -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, &Vars.g.rsync_port)
FN_LOCAL_STRING(lp_auth_users, auth_users)
FN_LOCAL_STRING(lp_charset, charset)
diff --git a/main.c b/main.c
-index 2ef2f47..3535264 100644
--- a/main.c
+++ b/main.c
-@@ -1195,6 +1195,18 @@ static int start_client(int argc, char *argv[])
+@@ -1238,6 +1238,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);
char *dummy_host;
int dummy_port = 0;
diff --git a/options.c b/options.c
-index e7c6c61..dae5716 100644
--- a/options.c
+++ b/options.c
-@@ -566,6 +566,7 @@ static void print_rsync_version(enum logcode f)
+@@ -567,6 +567,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
-@@ -599,6 +600,9 @@ static void print_rsync_version(enum logcode f)
- #if defined HAVE_LUTIMES && defined HAVE_UTIMES
+@@ -600,6 +601,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);
-@@ -612,8 +616,8 @@ static void print_rsync_version(enum logcode f)
+@@ -613,8 +617,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);
#ifdef MAINTAINER_MODE
rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
diff --git a/rsync.h b/rsync.h
-index be7cf8a..8353124 100644
--- a/rsync.h
+++ b/rsync.h
-@@ -194,6 +194,10 @@
+@@ -199,6 +199,10 @@
#define SIGNIFICANT_ITEM_FLAGS (~(\
ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
#define CFN_KEEP_TRAILING_SLASH (1<<1)
#define CFN_DROP_TRAILING_DOT_DIR (1<<2)
diff --git a/rsync.yo b/rsync.yo
-index 941f7a5..1518b3f 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -148,7 +148,12 @@ particular rsync daemon by leaving off the module name:
diff --git a/rsyncd.conf b/rsyncd.conf
new file mode 100644
-index 0000000..971723f
--- /dev/null
+++ b/rsyncd.conf
@@ -0,0 +1,3 @@
+slp refresh = 300
+
diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
-index d4978cd..318f0ec 100644
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
-@@ -108,6 +108,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)
-@@ -739,6 +748,7 @@ use chroot = yes
+@@ -766,6 +775,7 @@ use chroot = yes
max connections = 4
syslog facility = local5
pid file = /var/run/rsyncd.pid
[ftp]
path = /var/ftp/./pub
diff --git a/socket.c b/socket.c
-index 5df3a50..a4a2b0a 100644
--- a/socket.c
+++ b/socket.c
@@ -530,6 +530,16 @@ void start_accept_loop(int port, int (*fn)(int, int))
for (i = 0, fd = -1; sp[i] >= 0; i++) {
diff --git a/srvloc.c b/srvloc.c
new file mode 100644
-index 0000000..99eea16
--- /dev/null
+++ b/srvloc.c
@@ -0,0 +1,103 @@
+}
diff --git a/srvreg.c b/srvreg.c
new file mode 100644
-index 0000000..04afe60
--- /dev/null
+++ b/srvreg.c
@@ -0,0 +1,128 @@
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff