Fixed failing hunks.

diff --git a/rsyncd-perm.diff b/rsyncd-perm.diff
index 27c519b..18fc7ca 100644 (file)
--- a/rsyncd-perm.diff
+++ b/rsyncd-perm.diff
@@ -1,30 +1,28 @@
---- orig/loadparm.c    2005-02-19 17:38:51
-+++ loadparm.c 2005-03-31 08:28:41
-@@ -144,6 +144,10 @@ typedef struct
+--- orig/loadparm.c    2005-06-10 21:33:28
++++ loadparm.c 2005-06-10 23:38:53
+@@ -143,6 +143,10 @@ typedef struct
        int timeout;
        int max_connections;
-       BOOL ignore_nonreadable;
+       int max_verbosity;
 +      int create_mask;
 +      int force_create_mode;
 +      int directory_mask;
 +      int force_directory_mode;
+       BOOL ignore_nonreadable;
  } service;
  
- 
-@@ -186,7 +190,11 @@ static service sDefault =
-       "*.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz",    /* dont compress */
+@@ -178,6 +182,10 @@ static service sDefault =
        0,        /* timeout */
        0,        /* max connections */
--      False     /* ignore nonreadable */
-+      False,    /* ignore nonreadable */
-+      CHMOD_BITS, /* create mask */
+       1,        /* max verbosity */
++      CHMOD_BITS,/* create mask */
 +      0,        /* force create mode */
-+      CHMOD_BITS, /* directory mask */
-+      0         /* force directory mode */
++      CHMOD_BITS,/* directory mask */
++      0,        /* force directory mode */
+       False     /* ignore nonreadable */
  };
  
- 
-@@ -306,6 +314,10 @@ static struct parm_struct parm_table[] =
+@@ -298,6 +306,10 @@ static struct parm_struct parm_table[] =
    {"log format",       P_STRING,  P_LOCAL,  &sDefault.log_format,  NULL,   0},
    {"refuse options",   P_STRING,  P_LOCAL,  &sDefault.refuse_options,NULL, 0},
    {"dont compress",    P_STRING,  P_LOCAL,  &sDefault.dont_compress,NULL,  0},
@@ -35,10 +33,10 @@
    {NULL,               P_BOOL,    P_NONE,   NULL,                  NULL,   0}
  };
  
-@@ -391,6 +403,10 @@ FN_LOCAL_STRING(lp_refuse_options, refus
- FN_LOCAL_STRING(lp_dont_compress, dont_compress)
+@@ -382,6 +394,10 @@ FN_LOCAL_STRING(lp_dont_compress, dont_c
  FN_LOCAL_INTEGER(lp_timeout, timeout)
  FN_LOCAL_INTEGER(lp_max_connections, max_connections)
+ FN_LOCAL_INTEGER(lp_max_verbosity, max_verbosity)
 +FN_LOCAL_INTEGER(lp_create_mask, create_mask)
 +FN_LOCAL_INTEGER(lp_force_create_mode, force_create_mode)
 +FN_LOCAL_INTEGER(lp_directory_mask, directory_mask)
@@ -79,7 +77,7 @@
                                rsyserr(FERROR, errno, "failed to set permissions on %s",
                                        full_fname(fname));
                                return 0;
---- orig/rsyncd.conf.yo        2005-05-22 20:53:34
+--- orig/rsyncd.conf.yo        2005-06-03 08:32:34
 +++ rsyncd.conf.yo     2005-03-31 08:28:41
 @@ -221,6 +221,70 @@ file transfers to and from that module s
  was run as root. This complements the "uid" option. The default is gid -2,