/*
* 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 *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,
+ /* 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,
};
{"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_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)