Latest patches.

[rsync.git/patches.git] / slp.diff

diff --git a/slp.diff b/slp.diff
index b430e204216d165006e7157fc0c8efff3b677d62..422425bd7da90cf464bf0913a2afae5b67ef3c81 100644 (file)
--- a/slp.diff
+++ b/slp.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
 TODO: the configure changes should abort if the user requests --enable-slp
 and we can't honor that request.
 
-based-on: d1a1fec1340254926e17f5d83f848f7574286a33
+based-on: c4a3f55be35726d0a033996dc37b0fb248b45cb5
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -44,7 +44,7 @@ diff --git a/Makefile.in b/Makefile.in
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
-@@ -1193,6 +1193,13 @@ int daemon_main(void)
+@@ -1234,6 +1234,13 @@ int daemon_main(void)
         * address too.  In fact, why not just do getnameinfo on the
         * local address??? */
  
@@ -61,7 +61,7 @@ diff --git a/clientserver.c b/clientserver.c
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -751,6 +751,29 @@ if test $rsync_cv_can_hardlink_special = yes; then
+@@ -752,6 +752,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
  
@@ -94,7 +94,7 @@ diff --git a/configure.ac b/configure.ac
 diff --git a/loadparm.c b/loadparm.c
 --- a/loadparm.c
 +++ b/loadparm.c
-@@ -99,6 +99,9 @@ typedef struct {
+@@ -102,6 +102,9 @@ typedef struct {
  
        int listen_backlog;
        int rsync_port;
@@ -104,7 +104,7 @@ diff --git a/loadparm.c b/loadparm.c
  } global_vars;
  
  /* This structure describes a single section.  Their order must match the
-@@ -317,6 +320,9 @@ static struct parm_struct parm_table[] =
+@@ -328,6 +331,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},
@@ -114,7 +114,7 @@ diff --git a/loadparm.c b/loadparm.c
   {"socket options",    P_STRING, P_GLOBAL,&Vars.g.socket_options,      NULL,0},
  
   {"auth users",        P_STRING, P_LOCAL, &Vars.l.auth_users,          NULL,0},
-@@ -450,6 +456,9 @@ FN_GLOBAL_STRING(lp_socket_options, &Vars.g.socket_options)
+@@ -465,6 +471,9 @@ FN_GLOBAL_STRING(lp_socket_options, &Vars.g.socket_options)
  
  FN_GLOBAL_INTEGER(lp_listen_backlog, &Vars.g.listen_backlog)
  FN_GLOBAL_INTEGER(lp_rsync_port, &Vars.g.rsync_port)
@@ -127,7 +127,7 @@ diff --git a/loadparm.c b/loadparm.c
 diff --git a/main.c b/main.c
 --- a/main.c
 +++ b/main.c
-@@ -1267,6 +1267,18 @@ static int start_client(int argc, char *argv[])
+@@ -1270,6 +1270,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);
@@ -218,7 +218,7 @@ new file mode 100644
 diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
 --- a/rsyncd.conf.yo
 +++ b/rsyncd.conf.yo
-@@ -126,6 +126,15 @@ via the bf(--sockopts) command-line option.
+@@ -127,6 +127,15 @@ via the bf(--sockopts) command-line option.
  dit(bf(listen backlog)) You can override the default backlog value when the
  daemon listens for connections.  It defaults to 5.
  
@@ -231,10 +231,10 @@ diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
 +Using 3600 (one hour) is a good number if you tend to change your
 +configuration.
 +
- enddit()
+ )
  
  manpagesection(MODULE PARAMETERS)
-@@ -863,6 +872,7 @@ use chroot = yes
+@@ -907,6 +916,7 @@ use chroot = yes
  max connections = 4
  syslog facility = local5
  pid file = /var/run/rsyncd.pid