X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9059e0ac2fe66857af46c5716749ea8789e99e1a..fa3e4a0548699ccaac41df2428fe1ad9d3659435:/loadparm.c

diff --git a/loadparm.c b/loadparm.c
index 10c45fef..bd37ac99 100644
--- a/loadparm.c
+++ b/loadparm.c
@@ -114,7 +114,7 @@ static global Globals;
 /*
  * This structure describes a single service.  Their order must match the
  * initializers below, which you can accomplish by keeping each sub-section
- * sorted.  (e.g. in vim, just visually select the subsection and use !sort.)
+ * sorted.  (e.g. in vim, just visually select each subsection and use !sort.)
  */
 typedef struct
 {
@@ -129,9 +129,11 @@ typedef struct
 	char *hosts_deny;
 	char *include;
 	char *include_from;
+	char *incoming_chmod;
 	char *lock_file;
 	char *log_format;
 	char *name;
+	char *outgoing_chmod;
 	char *path;
 	char *postxfer_exec;
 	char *prexfer_exec;
@@ -155,43 +157,48 @@ typedef struct
 } service;
 
 
-/* This is a default service used to prime a services structure */
+/* This is a default service used to prime a services structure.  In order
+ * to make these easy to keep sorted in the same way as the variables
+ * above, use the variable name in the leading comment, including a
+ * trailing ';' (to avoid a sorting problem with trailing digits). */
 static service sDefault =
 {
- /* auth_users */		NULL,
- /* comment */			NULL,
- /* dont_compress */		"*.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz",
- /* exclude */			NULL,
- /* exclude_from */		NULL,
- /* filter */			NULL,
- /* gid */			NOBODY_GROUP,
- /* hosts_allow */		NULL,
- /* hosts_deny */		NULL,
- /* include */			NULL,
- /* include_from */		NULL,
- /* lock_file */		DEFAULT_LOCK_FILE,
- /* log_format */		"%o %h [%a] %m (%u) %f %l",
- /* name */			NULL,
- /* path */			NULL,
- /* postxfer_exec */		NULL,
- /* prexfer_exec */		NULL,
- /* refuse_options */		NULL,
- /* secrets_file */		NULL,
- /* temp_dir */ 		NULL,
- /* uid */			NOBODY_USER,
-
- /* max_connections */		0,
- /* max_verbosity */		1,
- /* timeout */			0,
-
- /* ignore_errors */		False,
- /* ignore_nonreadable */	False,
- /* list */			True,
- /* read_only */		True,
- /* strict_modes */		True,
- /* transfer_logging */		False,
- /* use_chroot */		True,
- /* write_only */		False,
+ /* auth_users; */		NULL,
+ /* comment; */			NULL,
+ /* dont_compress; */		"*.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz",
+ /* exclude; */			NULL,
+ /* exclude_from; */		NULL,
+ /* filter; */			NULL,
+ /* gid; */			NOBODY_GROUP,
+ /* hosts_allow; */		NULL,
+ /* hosts_deny; */		NULL,
+ /* include; */			NULL,
+ /* include_from; */		NULL,
+ /* incoming_chmod; */		NULL,
+ /* lock_file; */		DEFAULT_LOCK_FILE,
+ /* log_format; */		"%o %h [%a] %m (%u) %f %l",
+ /* name; */			NULL,
+ /* outgoing_chmod; */		NULL,
+ /* path; */			NULL,
+ /* postxfer_exec; */		NULL,
+ /* prexfer_exec; */		NULL,
+ /* refuse_options; */		NULL,
+ /* secrets_file; */		NULL,
+ /* temp_dir; */ 		NULL,
+ /* uid; */			NOBODY_USER,
+
+ /* max_connections; */		0,
+ /* max_verbosity; */		1,
+ /* timeout; */			0,
+
+ /* ignore_errors; */		False,
+ /* ignore_nonreadable; */	False,
+ /* list; */			True,
+ /* read_only; */		True,
+ /* strict_modes; */		True,
+ /* transfer_logging; */	False,
+ /* use_chroot; */		True,
+ /* write_only; */		False,
 };
 
 
@@ -295,12 +302,14 @@ static struct parm_struct parm_table[] =
  {"ignore nonreadable",P_BOOL,   P_LOCAL, &sDefault.ignore_nonreadable,NULL,0},
  {"include from",      P_STRING, P_LOCAL, &sDefault.include_from,      NULL,0},
  {"include",           P_STRING, P_LOCAL, &sDefault.include,           NULL,0},
+ {"incoming chmod",    P_STRING, P_LOCAL, &sDefault.incoming_chmod,    NULL,0},
  {"list",              P_BOOL,   P_LOCAL, &sDefault.list,              NULL,0},
  {"lock file",         P_STRING, P_LOCAL, &sDefault.lock_file,         NULL,0},
  {"log format",        P_STRING, P_LOCAL, &sDefault.log_format,        NULL,0},
  {"max connections",   P_INTEGER,P_LOCAL, &sDefault.max_connections,   NULL,0},
  {"max verbosity",     P_INTEGER,P_LOCAL, &sDefault.max_verbosity,     NULL,0},
  {"name",              P_STRING, P_LOCAL, &sDefault.name,              NULL,0},
+ {"outgoing chmod",    P_STRING, P_LOCAL, &sDefault.outgoing_chmod,    NULL,0},
  {"path",              P_PATH,   P_LOCAL, &sDefault.path,              NULL,0},
 #ifdef HAVE_PUTENV
  {"post-xfer exec",    P_STRING, P_LOCAL, &sDefault.postxfer_exec,     NULL,0},
@@ -383,9 +392,11 @@ FN_LOCAL_STRING(lp_hosts_allow, hosts_allow)
 FN_LOCAL_STRING(lp_hosts_deny, hosts_deny)
 FN_LOCAL_STRING(lp_include, include)
 FN_LOCAL_STRING(lp_include_from, include_from)
+FN_LOCAL_STRING(lp_incoming_chmod, incoming_chmod)
 FN_LOCAL_STRING(lp_lock_file, lock_file)
 FN_LOCAL_STRING(lp_log_format, log_format)
 FN_LOCAL_STRING(lp_name, name)
+FN_LOCAL_STRING(lp_outgoing_chmod, outgoing_chmod)
 FN_LOCAL_STRING(lp_path, path)
 FN_LOCAL_STRING(lp_postxfer_exec, postxfer_exec)
 FN_LOCAL_STRING(lp_prexfer_exec, prexfer_exec)