From ca9f901853e35ea92c14598cd8ebf7e5001a4e7d Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Thu, 28 Jul 2005 17:28:43 +0000 Subject: [PATCH] Fixed failing hunk. --- rsyncd-perm.diff | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/rsyncd-perm.diff b/rsyncd-perm.diff index ba16931..e06c0d5 100644 --- a/rsyncd-perm.diff +++ b/rsyncd-perm.diff @@ -1,6 +1,6 @@ ---- orig/loadparm.c 2005-06-10 21:33:28 -+++ loadparm.c 2005-06-10 23:38:53 -@@ -143,6 +143,10 @@ typedef struct +--- orig/loadparm.c 2005-07-28 17:25:13 ++++ loadparm.c 2005-07-28 17:27:15 +@@ -145,6 +145,10 @@ typedef struct int timeout; int max_connections; int max_verbosity; @@ -11,7 +11,7 @@ BOOL ignore_nonreadable; } service; -@@ -178,6 +182,10 @@ static service sDefault = +@@ -182,6 +186,10 @@ static service sDefault = 0, /* timeout */ 0, /* max connections */ 1, /* max verbosity */ @@ -22,18 +22,18 @@ False /* ignore nonreadable */ }; -@@ -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}, +@@ -276,6 +284,10 @@ static struct parm_struct parm_table[] = + {"timeout", P_INTEGER, P_LOCAL, &sDefault.timeout, NULL, 0}, + {"max connections", P_INTEGER, P_LOCAL, &sDefault.max_connections,NULL, 0}, + {"max verbosity", P_INTEGER, P_LOCAL, &sDefault.max_verbosity,NULL, 0}, + {"create mask", P_OCTAL, P_LOCAL, &sDefault.create_mask, NULL, 0}, + {"force create mode",P_OCTAL, P_LOCAL, &sDefault.force_create_mode, NULL, 0}, + {"directory mask", P_OCTAL, P_LOCAL, &sDefault.directory_mask, NULL, 0}, + {"force directory mode",P_OCTAL,P_LOCAL, &sDefault.force_directory_mode, NULL, 0}, - {NULL, P_BOOL, P_NONE, NULL, NULL, 0} - }; - -@@ -382,6 +394,10 @@ FN_LOCAL_STRING(lp_dont_compress, dont_c + {"name", P_STRING, P_LOCAL, &sDefault.name, NULL, 0}, + {"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL, 0}, + {"lock file", P_STRING, P_LOCAL, &sDefault.lock_file, NULL, 0}, +@@ -392,6 +404,10 @@ FN_LOCAL_STRING(lp_postxfer_exec, postxf FN_LOCAL_INTEGER(lp_timeout, timeout) FN_LOCAL_INTEGER(lp_max_connections, max_connections) FN_LOCAL_INTEGER(lp_max_verbosity, max_verbosity) @@ -85,9 +85,9 @@ if (ret < 0) { rsyserr(FERROR, errno, "failed to set permissions on %s", ---- orig/rsyncd.conf.yo 2005-07-07 23:11:09 +--- orig/rsyncd.conf.yo 2005-07-28 17:25:13 +++ rsyncd.conf.yo 2005-03-31 08:28:41 -@@ -221,6 +221,70 @@ file transfers to and from that module s +@@ -218,6 +218,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". -- 2.34.1