/* This is based on loadparm.c from Samba, written by Andrew Tridgell
and Karl Auer */
-/* some fixes
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/*
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+/* some fixes
+ *
+ * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
+ */
/*
* Load parameters.
/*
* 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
{
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;
char *refuse_options;
char *secrets_file;
+ char *temp_dir;
char *uid;
int max_connections;
} 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,
- /* 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,
};
{"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},
{"refuse options", P_STRING, P_LOCAL, &sDefault.refuse_options, NULL,0},
{"secrets file", P_STRING, P_LOCAL, &sDefault.secrets_file, NULL,0},
{"strict modes", P_BOOL, P_LOCAL, &sDefault.strict_modes, NULL,0},
+ {"temp dir", P_PATH, P_LOCAL, &sDefault.temp_dir, NULL,0},
{"timeout", P_INTEGER,P_LOCAL, &sDefault.timeout, NULL,0},
{"transfer logging", P_BOOL, P_LOCAL, &sDefault.transfer_logging, NULL,0},
{"uid", P_STRING, P_LOCAL, &sDefault.uid, NULL,0},
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)
FN_LOCAL_STRING(lp_refuse_options, refuse_options)
FN_LOCAL_STRING(lp_secrets_file, secrets_file)
+FN_LOCAL_STRING(lp_temp_dir, temp_dir)
FN_LOCAL_STRING(lp_uid, uid)
FN_LOCAL_INTEGER(lp_max_connections, max_connections)
BOOL lp_load(char *pszFname, int globals_only)
{
extern int am_server;
- extern int am_daemon;
extern int am_root;
pstring n2;
BOOL bRetval;
if (pszFname)
pstrcpy(n2,pszFname);
- else if (am_server && am_daemon && !am_root)
+ else if (am_server && !am_root)
pstrcpy(n2,RSYNCD_USERCONF);
else
pstrcpy(n2,RSYNCD_SYSCONF);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff