The patches for 3.0.9.

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

diff --git a/dparam.diff b/dparam.diff
index 95f920fea7d97d8a61b6a07f2b7b9276b11993c3..5867aad17b72a38b1fd538744d2d8a46224586ad 100644 (file)
--- a/dparam.diff
+++ b/dparam.diff
@@ -7,10 +7,11 @@ To use this patch, run these commands for a successful build:
     ./configure                               (optional if already run)
     make
 
+based-on: 40afd365cc8ca968fd16e161d24df5b8a8a520cc
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
-@@ -1045,6 +1045,7 @@ int daemon_main(void)
+@@ -1055,6 +1055,7 @@ int daemon_main(void)
                fprintf(stderr, "Failed to parse config file: %s\n", config_file);
                exit_cleanup(RERR_SYNTAX);
        }
@@ -21,7 +22,7 @@ diff --git a/clientserver.c b/clientserver.c
 diff --git a/loadparm.c b/loadparm.c
 --- a/loadparm.c
 +++ b/loadparm.c
-@@ -51,6 +51,9 @@
+@@ -49,6 +49,9 @@
  
  #include "rsync.h"
  #include "ifuncs.h"
@@ -31,7 +32,7 @@ diff --git a/loadparm.c b/loadparm.c
  #define PTR_DIFF(p1,p2) ((ptrdiff_t)(((char *)(p1)) - (char *)(p2)))
  #define strequal(a,b) (strcasecmp(a,b)==0)
  #define BOOLSTR(b) ((b) ? "Yes" : "No")
-@@ -780,8 +783,11 @@ static BOOL do_section(char *sectionname)
+@@ -778,8 +781,11 @@ static BOOL do_section(char *sectionname)
     bRetval = False;
  
     /* if we were in a global section then do the local inits */
@@ -44,7 +45,7 @@ diff --git a/loadparm.c b/loadparm.c
  
     /* if we've just struck a global section, note the fact. */
     bInGlobalSection = isglobal;
-@@ -844,6 +850,29 @@ BOOL lp_load(char *pszFname, int globals_only)
+@@ -842,6 +848,29 @@ BOOL lp_load(char *pszFname, int globals_only)
        return (bRetval);
  }
  
@@ -77,7 +78,7 @@ diff --git a/loadparm.c b/loadparm.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -124,6 +124,7 @@ int inplace = 0;
+@@ -122,6 +122,7 @@ int inplace = 0;
  int delay_updates = 0;
  long block_size = 0; /* "long" because popt can't set an int32. */
  char *skip_compress = NULL;
@@ -85,7 +86,7 @@ diff --git a/options.c b/options.c
  
  /** Network address family. **/
  int default_af_hint
-@@ -653,6 +654,7 @@ static struct poptOption long_options[] = {
+@@ -651,6 +652,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 +94,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}
-@@ -667,6 +669,7 @@ static void daemon_usage(enum logcode F)
+@@ -665,6 +667,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 +102,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");
-@@ -688,6 +691,7 @@ static struct poptOption long_daemon_options[] = {
+@@ -686,6 +689,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 +110,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 },
-@@ -971,11 +975,24 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -969,11 +973,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 +135,7 @@ diff --git a/options.c b/options.c
                                case 'v':
                                        verbose++;
                                        break;
-@@ -989,6 +1006,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -987,6 +1004,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                                }
                        }
  
@@ -147,7 +148,7 @@ diff --git a/options.c b/options.c
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo
-@@ -439,6 +439,7 @@ accepted: verb(
+@@ -452,6 +452,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 +156,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
-@@ -2147,6 +2148,14 @@ The default is /etc/rsyncd.conf unless the daemon is running over
+@@ -2271,6 +2272,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,7 +189,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
-@@ -260,6 +264,12 @@ If the daemon fails to open the specified file, it will fall back to
+@@ -266,6 +270,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.)