X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/3215b7e17bc725ab1f9d9f53bfbecb80d0642c90..41b674b3ed541263d70a10d7796aca5d6cd73e03:/dparam.diff

diff --git a/dparam.diff b/dparam.diff
index c944c57..95f920f 100644
--- a/dparam.diff
+++ b/dparam.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
-@@ -1043,6 +1043,7 @@ int daemon_main(void)
+@@ -1045,6 +1045,7 @@ int daemon_main(void)
  		fprintf(stderr, "Failed to parse config file: %s\n", config_file);
  		exit_cleanup(RERR_SYNTAX);
  	}
@@ -85,7 +85,7 @@ diff --git a/options.c b/options.c
  
  /** Network address family. **/
  int default_af_hint
-@@ -652,6 +653,7 @@ static struct poptOption long_options[] = {
+@@ -653,6 +654,7 @@ static struct poptOption long_options[] = {
    /* All the following options switch us into daemon-mode option-parsing. */
    {"config",           0,  POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
    {"daemon",           0,  POPT_ARG_NONE,   0, OPT_DAEMON, 0, 0 },
@@ -93,7 +93,7 @@ diff --git a/options.c b/options.c
    {"detach",           0,  POPT_ARG_NONE,   0, OPT_DAEMON, 0, 0 },
    {"no-detach",        0,  POPT_ARG_NONE,   0, OPT_DAEMON, 0, 0 },
    {0,0,0,0, 0, 0, 0}
-@@ -666,6 +668,7 @@ static void daemon_usage(enum logcode F)
+@@ -667,6 +669,7 @@ static void daemon_usage(enum logcode F)
    rprintf(F,"     --address=ADDRESS       bind to the specified address\n");
    rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth; KBytes per second\n");
    rprintf(F,"     --config=FILE           specify alternate rsyncd.conf file\n");
@@ -101,7 +101,7 @@ diff --git a/options.c b/options.c
    rprintf(F,"     --no-detach             do not detach from the parent\n");
    rprintf(F,"     --port=PORT             listen on alternate port number\n");
    rprintf(F,"     --log-file=FILE         override the \"log file\" setting\n");
-@@ -687,6 +690,7 @@ static struct poptOption long_daemon_options[] = {
+@@ -688,6 +691,7 @@ static struct poptOption long_daemon_options[] = {
    {"bwlimit",          0,  POPT_ARG_INT,    &daemon_bwlimit, 0, 0, 0 },
    {"config",           0,  POPT_ARG_STRING, &config_file, 0, 0, 0 },
    {"daemon",           0,  POPT_ARG_NONE,   &daemon_opt, 0, 0, 0 },
@@ -109,7 +109,7 @@ diff --git a/options.c b/options.c
    {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
    {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
    {"detach",           0,  POPT_ARG_VAL,    &no_detach, 0, 0, 0 },
-@@ -970,11 +974,24 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -971,11 +975,24 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  			pc = poptGetContext(RSYNC_NAME, argc, argv,
  					    long_daemon_options, 0);
  			while ((opt = poptGetNextOpt(pc)) != -1) {
@@ -134,7 +134,7 @@ diff --git a/options.c b/options.c
  				case 'v':
  					verbose++;
  					break;
-@@ -988,6 +1005,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -989,6 +1006,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  				}
  			}
  
@@ -147,7 +147,7 @@ diff --git a/options.c b/options.c
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo
-@@ -435,6 +435,7 @@ accepted: verb(
+@@ -439,6 +439,7 @@ accepted: verb(
       --address=ADDRESS       bind to the specified address
       --bwlimit=KBPS          limit I/O bandwidth; KBytes per second
       --config=FILE           specify alternate rsyncd.conf file
@@ -155,7 +155,7 @@ diff --git a/rsync.yo b/rsync.yo
       --no-detach             do not detach from the parent
       --port=PORT             listen on alternate port number
       --log-file=FILE         override the "log file" setting
-@@ -2131,6 +2132,14 @@ The default is /etc/rsyncd.conf unless the daemon is running over
+@@ -2147,6 +2148,14 @@ The default is /etc/rsyncd.conf unless the daemon is running over
  a remote shell program and the remote user is not the super-user; in that case
  the default is rsyncd.conf in the current directory (typically $HOME).
  
@@ -188,18 +188,7 @@ diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
  
  dit(bf(port)) You can override the default port the daemon will listen on
  by specifying this value (defaults to 873).  This is ignored if the daemon
-@@ -101,8 +105,8 @@ who like to tune their systems to the utmost degree. You can set all
- sorts of socket options which may make transfers faster (or
- slower!). Read the man page for the code(setsockopt()) system call for
- details on some of the options you may be able to set. By default no
--special socket options are set.  These settings are superseded by the
--bf(--sockopts) command-line option.
-+special socket options are set.  These settings can also be specified
-+via the bf(--sockopts) command-line option.
- 
- enddit()
- 
-@@ -260,6 +264,12 @@ If the daemon fails to open to specified file, it will fall back to
+@@ -260,6 +264,12 @@ If the daemon fails to open the specified file, it will fall back to
  using syslog and output an error about the failure.  (Note that the
  failure to open the specified log file used to be a fatal error.)