Changed the style of the diff headers (use "patch -p1" now).

[rsync/rsync-patches.git] / rsyncd-perm.diff

diff --git a/rsyncd-perm.diff b/rsyncd-perm.diff
index f73d0f1..ac458e3 100644 (file)
--- a/rsyncd-perm.diff
+++ b/rsyncd-perm.diff
@@ -1,6 +1,6 @@
---- orig/loadparm.c    2005-09-19 17:21:10
-+++ loadparm.c 2005-09-16 20:41:11
-@@ -140,6 +140,10 @@ typedef struct
+--- old/loadparm.c
++++ new/loadparm.c
+@@ -142,6 +142,10 @@ typedef struct
        char *temp_dir;
        char *uid;
  
@@ -11,7 +11,7 @@
        int max_connections;
        int max_verbosity;
        int timeout;
-@@ -183,6 +187,10 @@ static service sDefault =
+@@ -187,6 +191,10 @@ static service sDefault =
   /* temp_dir; */              NULL,
   /* uid; */                   NOBODY_USER,
  
@@ -22,7 +22,7 @@
   /* max_connections; */               0,
   /* max_verbosity; */         1,
   /* timeout; */                       0,
-@@ -287,10 +295,14 @@ static struct parm_struct parm_table[] =
+@@ -291,10 +299,14 @@ static struct parm_struct parm_table[] =
  
   {"auth users",        P_STRING, P_LOCAL, &sDefault.auth_users,        NULL,0},
   {"comment",           P_STRING, P_LOCAL, &sDefault.comment,           NULL,0},
@@ -37,7 +37,7 @@
   {"gid",               P_STRING, P_LOCAL, &sDefault.gid,               NULL,0},
   {"hosts allow",       P_STRING, P_LOCAL, &sDefault.hosts_allow,       NULL,0},
   {"hosts deny",        P_STRING, P_LOCAL, &sDefault.hosts_deny,        NULL,0},
-@@ -397,6 +409,10 @@ FN_LOCAL_STRING(lp_secrets_file, secrets
+@@ -405,6 +417,10 @@ FN_LOCAL_STRING(lp_secrets_file, secrets
  FN_LOCAL_STRING(lp_temp_dir, temp_dir)
  FN_LOCAL_STRING(lp_uid, uid)
  
@@ -48,9 +48,9 @@
  FN_LOCAL_INTEGER(lp_max_connections, max_connections)
  FN_LOCAL_INTEGER(lp_max_verbosity, max_verbosity)
  FN_LOCAL_INTEGER(lp_timeout, timeout)
---- orig/rsync.c       2005-07-27 23:31:12
-+++ rsync.c    2005-07-28 00:54:53
-@@ -32,6 +32,8 @@ extern int am_server;
+--- old/rsync.c
++++ new/rsync.c
+@@ -43,6 +43,8 @@ extern int am_server;
  extern int am_sender;
  extern int am_generator;
  extern int am_starting_up;
@@ -59,7 +59,7 @@
  extern int preserve_uid;
  extern int preserve_gid;
  extern int inplace;
-@@ -56,6 +58,7 @@ int set_perms(char *fname,struct file_st
+@@ -116,6 +118,7 @@ int set_file_attrs(char *fname, struct f
        int updated = 0;
        STRUCT_STAT st2;
        int change_uid, change_gid;
@@ -67,7 +67,7 @@
  
        if (!st) {
                if (dry_run)
-@@ -125,9 +128,19 @@ int set_perms(char *fname,struct file_st
+@@ -191,9 +194,19 @@ int set_file_attrs(char *fname, struct f
                updated = 1;
        }
  
@@ -89,9 +89,9 @@
                if (ret < 0) {
                        rsyserr(FERROR, errno,
                                "failed to set permissions on %s",
---- orig/rsyncd.conf.yo        2005-07-29 02:47:20
-+++ rsyncd.conf.yo     2005-03-31 08:28:41
-@@ -218,6 +218,70 @@ file transfers to and from that module s
+--- old/rsyncd.conf.yo
++++ new/rsyncd.conf.yo
+@@ -219,6 +219,70 @@ file transfers to and from that module s
  was run as root. This complements the "uid" option. The default is gid -2,
  which is normally the group "nobody".